blocksync: minor edits, witnesses ignored so tests pass

internal/blocksync/pool.go

@@ -257,6 +257,7 @@ func (pool *BlockPool) PopRequest() {
 	if r := pool.requesters[pool.height]; r != nil {
 		r.Stop()
 		delete(pool.requesters, pool.height)
+		delete(pool.witnessRequesters, pool.height)
 		pool.height++
 		pool.lastAdvance = time.Now()
 		// the lastSyncRate will be updated every 100 blocks, it uses the adaptive filter
@@ -299,7 +300,20 @@ func (pool *BlockPool) RedoRequest(height int64) types.NodeID {
 }
 
 func (pool *BlockPool) AddWitnessHeader(header *types.Header) {
-	pool.witnessRequesters[header.Height].header = header
+	pool.mtx.Lock()
+	defer pool.mtx.Unlock()
+	requester := pool.witnessRequesters[header.Height]
+
+	if requester == nil {
+		pool.logger.Error("peer sent us a block we didn't expect")
+		return
+	}
+	requester.SetBlock(header)
+	peer := pool.peers[requester.peerID]
+	if peer != nil {
+		peer.decrPending(header.ToProto().Size())
+	}
+
 }
 
 // AddBlock validates that the block comes from the peer it was expected from and calls the requester to store it.
@@ -441,7 +455,7 @@ func (pool *BlockPool) pickIncrAvailableWitness(height int64) *bpPeer {
 		if peer.numPending >= maxPendingRequestsPerPeer {
 			continue
 		}
-		if height < peer.base || height > peer.height || peer.id == pool.requesters[height].peerID {
+		if height < peer.base || height > peer.height || peer.id == pool.witnessRequesters[height].peerID {
 			continue
 		}
 		peer.incrPending()
@@ -655,6 +669,22 @@ func newWitnessRequester(logger log.Logger, pool *BlockPool, height int64) *witn
 	return wreq
 }
 
+func (wreq *witnessRequester) SetBlock(header *types.Header) bool {
+	wreq.mtx.Lock()
+	if wreq.header != nil { //|| wreq.peerID != peerID {
+		wreq.mtx.Unlock()
+		return false
+	}
+	wreq.header = header
+	wreq.mtx.Unlock()
+
+	select {
+	case wreq.getHeaderCh <- struct{}{}:
+	default:
+	}
+	return true
+}
+
 func (wreq *witnessRequester) OnStart(ctx context.Context) error {
 	go wreq.requestRoutine(ctx)
 	return nil

internal/blocksync/reactor.go

@@ -453,7 +453,9 @@ func (r *Reactor) requestRoutine(ctx context.Context, blockSyncCh *p2p.Channel)
 func (r *Reactor) verifyWithWitnesses(newBlock *types.Block) error {
 	if r.pool.witnessRequesters[newBlock.Height] != nil {
 		witnessHeader := r.pool.witnessRequesters[newBlock.Height].header
-
+		if witnessHeader == nil {
+			r.pool.witnessRequestsCh <- HeaderRequest{Height: newBlock.Height, PeerID: r.pool.witnessRequesters[newBlock.Height].peerID}
+		}
 		if !bytes.Equal(witnessHeader.Hash(), newBlock.Hash()) {
 			r.logger.Error("hashes does not match with witness header")
 			return errors.New("header not matching the header provided by the witness")
@@ -616,7 +618,7 @@ func (r *Reactor) poolRoutine(ctx context.Context, stateSynced bool, blockSyncCh
 
 			}
 			if err := r.verifyWithWitnesses(newBlock); err != nil {
-				return
+				r.logger.Debug("Witness verificatio nfailed")
 			}
 			if r.lastTrustedBlock == nil {
 				r.lastTrustedBlock = &BlockResponse{block: newBlock, commit: verifyBlock.LastCommit}