using syncing package instead

node/node.go

@@ -20,6 +20,7 @@ import (
 	"github.com/simple-rules/harmony-benchmark/pow"
 	"github.com/simple-rules/harmony-benchmark/proto/identity"
 	proto_node "github.com/simple-rules/harmony-benchmark/proto/node"
+	"github.com/simple-rules/harmony-benchmark/syncing"
 )
 
 // Node represents a program (machine) participating in the network
@@ -95,7 +96,7 @@ func (node *Node) getTransactionsForNewBlock(maxNumTxs int) ([]*blockchain.Trans
 // Start a server and process the request by a handler.
 func (node *Node) StartServer(port string) {
 	if node.SyncNode {
-		node.startBlockSyncing()
+		node.blockchain = syncing.StartBlockSyncing(node.Consensus.GetValidatorPeers())
 	}
 	fmt.Println("Hello in server now")
 	node.log.Debug("Starting server", "node", node, "port", port)

syncing/syncing.go

@@ -1,4 +1,4 @@
-package sync
+package syncing
 
 import (
 	"bufio"
@@ -8,7 +8,6 @@ import (
 
 	"github.com/Workiva/go-datastructures/queue"
 	"github.com/simple-rules/harmony-benchmark/blockchain"
-	"github.com/simple-rules/harmony-benchmark/node"
 	"github.com/simple-rules/harmony-benchmark/p2p"
 	proto_node "github.com/simple-rules/harmony-benchmark/proto/node"
 )
@@ -33,8 +32,7 @@ type SyncConfig struct {
 	peers []SyncPeerConfig
 }
 
-func StartBlockSyncing(node *node.Node) *blockchain.Blockchain {
+func StartBlockSyncing(peers []p2p.Peer) *blockchain.Blockchain {
-	peers := node.Consensus.GetValidatorPeers()
 	peer_number := len(peers)
 	syncConfig := SyncConfig{
 		peers: make([]SyncPeerConfig, peer_number),
@@ -117,11 +115,7 @@ TASK_LOOP:
 	bc := &blockchain.Blockchain{
 		Blocks: make([]*blockchain.Block, blockSize),
 	}
-	// loop to do syncing.
-	for {
-		var wg sync.WaitGroup
 	wg.Add(activePeerNumber)
-
 	for _, configPeer := range syncConfig.peers {
 		if configPeer.err != nil {
 			continue
@@ -151,7 +145,7 @@ TASK_LOOP:
 		}(&configPeer, taskSyncQueue, bc)
 	}
 	wg.Wait()
-	}
+	return bc
 }
 
 func getConsensus(syncConfig *SyncConfig) bool {