wip

.golangci.yml

@@ -60,8 +60,6 @@ linters-settings:
   #   check-shadowing: true
   revive:
     min-confidence: 0
-  maligned:
-    suggest-new: true
   misspell:
     locale: US
     ignore-words:

cmd/tendermint/commands/rollback.go

@@ -78,7 +78,7 @@ func loadStateAndBlockStore(config *cfg.Config) (*store.BlockStore, state.Store,
 		return nil, nil, err
 	}
 	stateStore := state.NewStore(stateDB, state.StoreOptions{
-		DiscardABCIResponses: cfg.RPC.DiscardABCIResponses,
+		DiscardABCIResponses: config.RPC.DiscardABCIResponses,
 	})
 
 	return blockStore, stateStore, nil

state/export_test.go

@@ -43,6 +43,6 @@ func ValidateValidatorUpdates(abciUpdates []abci.ValidatorUpdate, params tmproto
 // SaveValidatorsInfo is an alias for the private saveValidatorsInfo method in
 // store.go, exported exclusively and explicitly for testing.
 func SaveValidatorsInfo(db dbm.DB, height, lastHeightChanged int64, valSet *types.ValidatorSet) error {
-	stateStore := dbStore{db}
+	stateStore := dbStore{db, StoreOptions{DiscardABCIResponses: false}}
 	return stateStore.saveValidatorsInfo(height, lastHeightChanged, valSet)
 }

test/maverick/node/node.go

@@ -439,10 +439,11 @@ func createEvidenceReactor(config *cfg.Config, dbProvider DBProvider,
 	if err != nil {
 		return nil, nil, err
 	}
+	stateStore := sm.NewStore(stateDB, sm.StoreOptions{
+		DiscardABCIResponses: config.RPC.DiscardABCIResponses,
+	})
 	evidenceLogger := logger.With("module", "evidence")
-	evidencePool, err := evidence.NewPool(logger, evidenceDB, sm.NewStore(stateDB, sm.StoreOptions{
-		DiscardABCIResponses: cfg.RPC.DiscardABCIResponses,
-	}), blockStore)
+	evidencePool, err := evidence.NewPool( evidenceDB, stateStore , blockStore)
 	if err != nil {
 		return nil, nil, err
 	}