nit

cmd/tendermint/commands/replay.go

@@ -14,7 +14,7 @@ func MakeReplayCommand(conf *config.Config, logger log.Logger) *cobra.Command {
 		Use:   "replay",
 		Short: "Replay messages from WAL",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return consensus.RunReplayFile(cmd.Context(), logger, conf.BaseConfig, conf.Consensus, conf.DBSync, false)
+			return consensus.RunReplayFile(cmd.Context(), logger, conf.BaseConfig, conf.Consensus, false)
 		},
 	}
 }
@@ -25,7 +25,7 @@ func MakeReplayConsoleCommand(conf *config.Config, logger log.Logger) *cobra.Com
 		Use:   "replay-console",
 		Short: "Replay messages from WAL in a console",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return consensus.RunReplayFile(cmd.Context(), logger, conf.BaseConfig, conf.Consensus, conf.DBSync, true)
+			return consensus.RunReplayFile(cmd.Context(), logger, conf.BaseConfig, conf.Consensus, true)
 		},
 	}
 }

internal/consensus/common_test.go

@@ -505,8 +505,6 @@ func newStateWithConfigAndBlockStore(
 	blockExec := sm.NewBlockExecutor(stateStore, logger, proxyAppConnCon, mempool, evpool, blockStore, eventBus, sm.NopMetrics())
 	cs, err := NewState(logger.With("module", "consensus"),
 		thisConfig.Consensus,
-		thisConfig.DBSync,
-		thisConfig.BaseConfig,
 		stateStore,
 		blockExec,
 		blockStore,

internal/consensus/reactor_test.go

@@ -506,7 +506,7 @@ func TestReactorWithEvidence(t *testing.T) {
 		blockExec := sm.NewBlockExecutor(stateStore, log.NewNopLogger(), proxyAppConnCon, mempool, evpool, blockStore, eventBus, sm.NopMetrics())
 
 		cs, err := NewState(logger.With("validator", i, "module", "consensus"),
-			thisConfig.Consensus, thisConfig.DBSync, thisConfig.BaseConfig, stateStore, blockExec, blockStore, mempool, evpool2, eventBus, []trace.TracerProviderOption{})
+			thisConfig.Consensus, stateStore, blockExec, blockStore, mempool, evpool2, eventBus, []trace.TracerProviderOption{})
 		require.NoError(t, err)
 		cs.SetPrivValidator(ctx, pv)
 

internal/consensus/replay_file.go

@@ -37,10 +37,9 @@ func RunReplayFile(
 	logger log.Logger,
 	cfg config.BaseConfig,
 	csConfig *config.ConsensusConfig,
-	dbsyncConfig *config.DBSyncConfig,
 	console bool,
 ) error {
-	consensusState, err := newConsensusStateForReplay(ctx, cfg, logger, csConfig, dbsyncConfig)
+	consensusState, err := newConsensusStateForReplay(ctx, cfg, logger, csConfig)
 	if err != nil {
 		return err
 	}
@@ -147,7 +146,7 @@ func (pb *playback) replayReset(ctx context.Context, count int, newStepSub event
 	pb.cs.Stop()
 	pb.cs.Wait()
 
-	newCS, err := NewState(pb.cs.logger, pb.cs.config, pb.cs.dbsyncConfig, pb.cs.baseConfig, pb.stateStore, pb.cs.blockExec,
+	newCS, err := NewState(pb.cs.logger, pb.cs.config, pb.stateStore, pb.cs.blockExec,
 		pb.cs.blockStore, pb.cs.txNotifier, pb.cs.evpool, pb.cs.eventBus, pb.cs.tracerProviderOptions)
 	if err != nil {
 		return err
@@ -301,7 +300,6 @@ func newConsensusStateForReplay(
 	cfg config.BaseConfig,
 	logger log.Logger,
 	csConfig *config.ConsensusConfig,
-	dbsyncConfig *config.DBSyncConfig,
 ) (*State, error) {
 	dbType := dbm.BackendType(cfg.DBBackend)
 	// Get BlockStore
@@ -353,7 +351,7 @@ func newConsensusStateForReplay(
 	mempool, evpool := emptyMempool{}, sm.EmptyEvidencePool{}
 	blockExec := sm.NewBlockExecutor(stateStore, logger, proxyApp, mempool, evpool, blockStore, eventBus, sm.NopMetrics())
 
-	consensusState, err := NewState(logger, csConfig, dbsyncConfig, cfg, stateStore, blockExec,
+	consensusState, err := NewState(logger, csConfig, stateStore, blockExec,
 		blockStore, mempool, evpool, eventBus, []trace.TracerProviderOption{})
 	if err != nil {
 		return nil, err

internal/consensus/state.go

@@ -22,7 +22,6 @@ import (
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/crypto"
 	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
-	"github.com/tendermint/tendermint/internal/dbsync"
 	"github.com/tendermint/tendermint/internal/eventbus"
 	"github.com/tendermint/tendermint/internal/jsontypes"
 	"github.com/tendermint/tendermint/internal/libs/autofile"
@@ -123,8 +122,6 @@ type State struct {
 	// config details
 	config            *config.ConsensusConfig
 	mempoolConfig     *config.MempoolConfig
-	dbsyncConfig      *config.DBSyncConfig
-	baseConfig        config.BaseConfig
 	privValidator     types.PrivValidator // for signing votes
 	privValidatorType types.PrivValidatorType
 
@@ -210,8 +207,6 @@ func SkipStateStoreBootstrap(sm *State) {
 func NewState(
 	logger log.Logger,
 	cfg *config.ConsensusConfig,
-	dbsyncConfig *config.DBSyncConfig,
-	baseConfig config.BaseConfig,
 	store sm.Store,
 	blockExec *sm.BlockExecutor,
 	blockStore sm.BlockStore,
@@ -225,8 +220,6 @@ func NewState(
 		eventBus:         eventBus,
 		logger:           logger,
 		config:           cfg,
-		dbsyncConfig:     dbsyncConfig,
-		baseConfig:       baseConfig,
 		blockExec:        blockExec,
 		blockStore:       blockStore,
 		stateStore:       store,
@@ -2211,12 +2204,6 @@ func (cs *State) finalizeCommit(ctx context.Context, height int64) {
 		logger.Error("failed to get private validator pubkey", "err", err)
 	}
 
-	if cs.dbsyncConfig.SnapshotInterval != 0 && height%int64(cs.dbsyncConfig.SnapshotInterval) == 0 {
-		if err := dbsync.Snapshot(uint64(height), *cs.dbsyncConfig, cs.baseConfig); err != nil {
-			logger.Error(fmt.Sprintf("snapshotting DB failed due to %s", err))
-		}
-	}
-
 	// cs.StartTime is already set.
 	// Schedule Round0 to start soon.
 	cs.scheduleRound0(cs.roundState.GetInternalPointer())

internal/consensus/wal_generator.go

@@ -82,7 +82,7 @@ func WALGenerateNBlocks(ctx context.Context, t *testing.T, logger log.Logger, wr
 	mempool := emptyMempool{}
 	evpool := sm.EmptyEvidencePool{}
 	blockExec := sm.NewBlockExecutor(stateStore, log.NewNopLogger(), proxyApp, mempool, evpool, blockStore, eventBus, sm.NopMetrics())
-	consensusState, err := NewState(logger, cfg.Consensus, cfg.DBSync, cfg.BaseConfig, stateStore, blockExec, blockStore, mempool, evpool, eventBus, []trace.TracerProviderOption{})
+	consensusState, err := NewState(logger, cfg.Consensus, stateStore, blockExec, blockStore, mempool, evpool, eventBus, []trace.TracerProviderOption{})
 	if err != nil {
 		t.Fatal(err)
 	}

node/node.go

@@ -58,12 +58,12 @@ type nodeImpl struct {
 	shouldHandshake bool                // set during makeNode
 
 	// network
-	peerManager     *p2p.PeerManager
-	router          *p2p.Router
+	peerManager      *p2p.PeerManager
+	router           *p2p.Router
 	routerRestartCh  chan struct{} // Used to signal a restart the node on the application level
 	ServiceRestartCh chan []string
-	nodeInfo        types.NodeInfo
-	nodeKey         types.NodeKey // our node privkey
+	nodeInfo         types.NodeInfo
+	nodeKey          types.NodeKey // our node privkey
 
 	// services
 	eventSinks     []indexer.EventSink
@@ -72,7 +72,7 @@ type nodeImpl struct {
 	blockStore     *store.BlockStore // store the blockchain to disk
 	evPool         *evidence.Pool
 	indexerService *indexer.Service
-	services 	   []service.Service
+	services       []service.Service
 	rpcListeners   []net.Listener // rpc servers
 	shutdownOps    closer
 	rpcEnv         *rpccore.Environment
@@ -320,8 +320,6 @@ func makeNode(
 
 	csState, err := consensus.NewState(logger.With("module", "consensus"),
 		cfg.Consensus,
-		cfg.DBSync,
-		cfg.BaseConfig,
 		stateStore,
 		blockExec,
 		blockStore,