cleans up the code

node/node.go

@@ -870,17 +870,11 @@ func NewNodeWithContext(ctx context.Context,
 		if err != nil {
 			return nil, fmt.Errorf("error during info call: %w", err)
 		}
-		softwareVersion = resp.Version // TODO is this the same as celestia-app version
+		softwareVersion = resp.Version
 	}
 
-	//resp, err := proxyApp.Query().InfoSync(proxy.RequestInfo)
-	//if err != nil {
-	//	return nil, fmt.Errorf("error during info call: %w", err)
-	//}
-
 	// Determine whether we should do fast sync. This must happen after the handshake, since the
-	// app may modify the validator set,
-	//specifying ourselves as the only validator.
+	// app may modify the validator set, specifying ourselves as the only validator.
 	fastSync := config.FastSyncMode && !onlyValidatorIsUs(state,
 		pubKey) // the state certainly has the latest timeouts according
 	// the app version lastBlock in the blockstore
@@ -939,9 +933,7 @@ func NewNodeWithContext(ctx context.Context,
 		privValidator, csMetrics, stateSync || fastSync, eventBus, consensusLogger, tracer,
 	)
 
-	logger.Info("Consensus reactor created", "timeout_propose",
-		consensusState.GetState().TimeoutPropose, "timeout_commit",
-		consensusState.GetState().TimeoutCommit)
+	logger.Info("Consensus reactor created", "timeout_propose", consensusState.GetState().TimeoutPropose, "timeout_commit", consensusState.GetState().TimeoutCommit)
 	// Set up state sync reactor, and schedule a sync if requested.
 	// FIXME The way we do phased startups (e.g. replay -> fast sync -> consensus) is very messy,
 	// we should clean this whole thing up. See:

rpc/core/consensus.go

@@ -88,9 +88,8 @@ func ConsensusState(ctx *rpctypes.Context) (*ctypes.ResultConsensusState, error)
 	return &ctypes.ResultConsensusState{RoundState: bz}, err
 }
 
-func ConsensusTimeoutsInfo(ctx *rpctypes.Context,
-	heightPtr int64) (*abci.TimeoutsInfo, error) {
-	return GetEnvironment().StateStore.LoadConsensusTimeoutsInfo(heightPtr)
+func ConsensusTimeoutsInfo(ctx *rpctypes.Context, height int64) (*abci.TimeoutsInfo, error) {
+	return GetEnvironment().StateStore.LoadConsensusTimeoutsInfo(height)
 }
 
 // ConsensusParams gets the consensus parameters at the given block height.

state/state.go

@@ -83,13 +83,6 @@ type State struct {
 	TimeoutCommit  time.Duration
 }
 
-func (state *State) GetTimeoutPropose() time.Duration {
-	return state.TimeoutPropose
-}
-func (state *State) GetTimeoutCommit() time.Duration {
-	return state.TimeoutCommit
-}
-
 // Copy makes a copy of the State for mutating.
 func (state State) Copy() State {
 	return State{

state/store.go

@@ -204,7 +204,6 @@ func (store dbStore) save(state State, key []byte) error {
 	}
 
 	// save next timeouts
-	// TODO write test for this
 	if err := store.saveConsensusTimeoutsInfo(nextHeight, &abci.TimeoutsInfo{TimeoutPropose: state.TimeoutPropose, TimeoutCommit: state.TimeoutCommit}); err != nil {
 		return err
 	}