Rebased onto dev.

api/service/stagedstreamsync/downloader.go

@@ -6,9 +6,6 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/event"
-	"github.com/harmony-one/harmony/consensus"
-	"github.com/rs/zerolog"
-
 	"github.com/harmony-one/harmony/consensus"
 	"github.com/harmony-one/harmony/core"
 	nodeconfig "github.com/harmony-one/harmony/internal/configs/node"
@@ -17,6 +14,7 @@ import (
 	"github.com/harmony-one/harmony/p2p/stream/common/streammanager"
 	"github.com/harmony-one/harmony/p2p/stream/protocols/sync"
 	"github.com/harmony-one/harmony/shard"
+	"github.com/rs/zerolog"
 )
 
 type (

api/service/stagedstreamsync/syncing.go

@@ -46,8 +46,6 @@ func CreateStagedSync(ctx context.Context,
 	protocol syncProtocol,
 	config Config,
 	logger zerolog.Logger,
-	logProgress bool,
-	c *consensus.Consensus,
 ) (*StagedStreamSync, error) {
 	logger.Info().
 		Uint32("shard", bc.ShardID()).
@@ -82,7 +80,7 @@ func CreateStagedSync(ctx context.Context,
 	}
 
 	stageHeadsCfg := NewStageHeadersCfg(bc, mainDB)
-	stageShortRangeCfg := NewStageShortRangeCfg(bc, mainDB, c)
+	stageShortRangeCfg := NewStageShortRangeCfg(bc, mainDB, consensus)
 	stageSyncEpochCfg := NewStageEpochCfg(bc, mainDB)
 	stageBodiesCfg := NewStageBodiesCfg(bc, mainDB, dbs, config.Concurrency, protocol, isBeaconNode, config.LogProgress)
 	stageStatesCfg := NewStageStatesCfg(bc, mainDB, dbs, config.Concurrency, logger, config.LogProgress)