Merge pull request #225 from bitcoin-sv/fix/blocktx-fill-gaps

fix/block-fill-gaps

blocktx/block_notifier.go

@@ -122,15 +122,24 @@ func NewBlockNotifier(storeI store.Interface, l utils.Logger, blockCh chan *bloc
 			bn.quitFillBlockGapComplete <- struct{}{}
 		}()
 
+		peerIndex := 0
 		for {
 			select {
 			case <-bn.quitFillBlockGap:
 				return
 			case <-bn.fillGapsTicker.C:
-				err := peerHandler.FillGaps(peers[0])
+				if peerIndex >= len(peers) {
+					peerIndex = 0
+				}
+
+				l.Infof("requesting missing blocks from peer %d", peerIndex)
+
+				err := peerHandler.FillGaps(peers[peerIndex])
 				if err != nil {
 					l.Errorf("failed to fill gaps: %v", err)
 				}
+
+				peerIndex++
 			}
 		}
 	}()

blocktx/block_notifier_test.go

@@ -63,14 +63,28 @@ func TestNewBlockNotifier(t *testing.T) {
 						ZMQ: 28332,
 					},
 				},
+				{
+					Host: "127.0.0.2",
+					Port: config.PeerPort{
+						P2P: 18333,
+						ZMQ: 28332,
+					},
+				},
+				{
+					Host: "127.0.0.3",
+					Port: config.PeerPort{
+						P2P: 18333,
+						ZMQ: 28332,
+					},
+				},
 			}
 
 			logger := gocore.Log("test", gocore.NewLogLevelFromString("INFO"))
 			peerHandler := NewPeerHandler(logger, storeMock, blockCh, 100)
 			notifier, err := NewBlockNotifier(storeMock, logger, blockCh, peerHandler, peerSettings, wire.TestNet3, WithFillGapsInterval(time.Millisecond*30))
 			require.NoError(t, err)
 
-			time.Sleep(55 * time.Millisecond)
+			time.Sleep(120 * time.Millisecond)
 			peerHandler.Shutdown()
 			notifier.Shutdown()
 		})

blocktx/peer_handler.go

@@ -403,7 +403,7 @@ func (bs *PeerHandler) FillGaps(peer p2p.PeerI) error {
 			return nil
 		}
 
-		bs.logger.Infof("filling block gap for hash %s at height %d", gaps.Hash.String(), gaps.Height)
+		bs.logger.Infof("requesting missing block hash %s at height %d", gaps.Hash.String(), gaps.Height)
 
 		pair := utils.NewPair(gaps.Hash, peer)
 		utils.SafeSend(bs.workerCh, pair)