From 4aa7d3cc673e9f335f1a61a3cf113c842408e656 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Mon, 24 Jun 2024 00:37:54 +0700 Subject: [PATCH 1/3] refactor --- block/manager.go | 6 +++--- block/manager_test.go | 2 ++ node/full_client_test.go | 1 + node/full_node_integration_test.go | 1 + types/utils.go | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/block/manager.go b/block/manager.go index 07e6a91754..5512674df4 100644 --- a/block/manager.go +++ b/block/manager.go @@ -166,12 +166,12 @@ func NewManager( execMetrics *state.Metrics, ) (*Manager, error) { s, err := getInitialState(store, genesis) - //set block height in store - store.SetHeight(context.Background(), s.LastBlockHeight) - if err != nil { return nil, err } + //set block height in store + store.SetHeight(context.Background(), s.LastBlockHeight) + // genesis should have exactly one "validator", the centralized sequencer. // this should have been validated in the above call to getInitialState. valSet := types.GetValidatorSetFromGenesis(genesis) diff --git a/block/manager_test.go b/block/manager_test.go index 04b3f8eefb..e3adabecdc 100644 --- a/block/manager_test.go +++ b/block/manager_test.go @@ -64,6 +64,7 @@ func TestInitialStateClean(t *testing.T) { es, _ := store.NewDefaultInMemoryKVStore() emptyStore := store.New(es) s, err := getInitialState(emptyStore, genesis) + require.NoError(err) require.Equal(s.LastBlockHeight, uint64(genesis.InitialHeight-1)) require.NoError(err) require.Equal(uint64(genesis.InitialHeight), s.InitialHeight) @@ -90,6 +91,7 @@ func TestInitialStateStored(t *testing.T) { err := store.UpdateState(ctx, sampleState) require.NoError(err) s, err := getInitialState(store, genesis) + require.NoError(err) require.Equal(s.LastBlockHeight, uint64(100)) require.NoError(err) require.Equal(s.InitialHeight, uint64(1)) diff --git a/node/full_client_test.go b/node/full_client_test.go index edf96a64e7..555b8876d9 100644 --- a/node/full_client_test.go +++ b/node/full_client_test.go @@ -184,6 +184,7 @@ func TestGenesisChunked(t *testing.T) { startNodeWithCleanup(t, rpc.node) expectedID = 0 gc2, err := rpc.GenesisChunked(context.Background(), expectedID) + require.NoError(t, err) gotID := gc2.ChunkNumber assert.NoError(err) assert.NotNil(gc2) diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go index 2746a842a3..a28f7b8a4f 100644 --- a/node/full_node_integration_test.go +++ b/node/full_node_integration_test.go @@ -193,6 +193,7 @@ func TestLazyAggregator(t *testing.T) { BlockManagerConfig: blockManagerConfig, LazyAggregator: true, }, key, signingKey, proxy.NewLocalClientCreator(app), genesisDoc, DefaultMetricsProvider(cmconfig.DefaultInstrumentationConfig()), log.TestingLogger()) + require.NoError(err) assert.False(node.IsRunning()) assert.NoError(err) diff --git a/types/utils.go b/types/utils.go index bb07c66b73..a3ef6e919f 100644 --- a/types/utils.go +++ b/types/utils.go @@ -281,10 +281,10 @@ func GetFirstSignedHeader(privkey ed25519.PrivKey, valSet *cmtypes.ValidatorSet) Validators: valSet, } commit, err := GetCommit(header, privkey) - signedHeader.Commit = *commit if err != nil { return nil, err } + signedHeader.Commit = *commit return &signedHeader, nil } From ec02e77fb1e82e2ed1ca23368af0c9099504a203 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Mon, 24 Jun 2024 09:16:31 +0700 Subject: [PATCH 2/3] refactor --- block/manager_test.go | 1 - node/full_node_integration_test.go | 1 - 2 files changed, 2 deletions(-) diff --git a/block/manager_test.go b/block/manager_test.go index e3adabecdc..c789e0d28d 100644 --- a/block/manager_test.go +++ b/block/manager_test.go @@ -93,7 +93,6 @@ func TestInitialStateStored(t *testing.T) { s, err := getInitialState(store, genesis) require.NoError(err) require.Equal(s.LastBlockHeight, uint64(100)) - require.NoError(err) require.Equal(s.InitialHeight, uint64(1)) } diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go index a28f7b8a4f..84e8321cda 100644 --- a/node/full_node_integration_test.go +++ b/node/full_node_integration_test.go @@ -195,7 +195,6 @@ func TestLazyAggregator(t *testing.T) { }, key, signingKey, proxy.NewLocalClientCreator(app), genesisDoc, DefaultMetricsProvider(cmconfig.DefaultInstrumentationConfig()), log.TestingLogger()) require.NoError(err) assert.False(node.IsRunning()) - assert.NoError(err) startNodeWithCleanup(t, node) require.NoError(waitForFirstBlock(node.(*FullNode), Header)) From 472170d13369e54f757da10a0e2613d7498b7278 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Wed, 26 Jun 2024 14:22:01 +0700 Subject: [PATCH 3/3] remove redundant err check --- block/manager_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/block/manager_test.go b/block/manager_test.go index c789e0d28d..0bb297706b 100644 --- a/block/manager_test.go +++ b/block/manager_test.go @@ -66,7 +66,6 @@ func TestInitialStateClean(t *testing.T) { s, err := getInitialState(emptyStore, genesis) require.NoError(err) require.Equal(s.LastBlockHeight, uint64(genesis.InitialHeight-1)) - require.NoError(err) require.Equal(uint64(genesis.InitialHeight), s.InitialHeight) }