Skip to content

Commit b8cc013

Browse files
gupadhyayagupadhyaya
committed
chainId to chainID
1 parent efa6433 commit b8cc013

14 files changed

Lines changed: 141 additions & 140 deletions

‎block/cache_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
func TestBlockCache(t *testing.T) {
12-
chainId := "TestBlockCache"
12+
chainID := "TestBlockCache"
1313
require := require.New(t)
1414
// Create new HeaderCache and DataCache and verify not nil
1515
hc := NewHeaderCache()
@@ -20,7 +20,7 @@ func TestBlockCache(t *testing.T) {
2020

2121
// Test setBlock and getBlock
2222
height, nTxs := uint64(1), 2
23-
header, data := types.GetRandomBlock(height, nTxs, chainId)
23+
header, data := types.GetRandomBlock(height, nTxs, chainID)
2424
hc.setHeader(height, header)
2525
gotHeader := hc.getHeader(height)
2626
require.NotNil(gotHeader, "getHeader should return non-nil after setHeader")
@@ -31,7 +31,7 @@ func TestBlockCache(t *testing.T) {
3131
require.Equal(data, gotData)
3232

3333
// Test overwriting a block
34-
header1, data1 := types.GetRandomBlock(height, nTxs, chainId)
34+
header1, data1 := types.GetRandomBlock(height, nTxs, chainID)
3535
hc.setHeader(height, header1)
3636
gotHeader1 := hc.getHeader(height)
3737
require.NotNil(gotHeader1, "getHeader should return non-nil after overwriting a header")

‎block/manager_test.go‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,11 @@ func getManager(t *testing.T, backend goDA.DA) *Manager {
8585
// }
8686

8787
func TestInitialStateClean(t *testing.T) {
88+
const chainID = "TestInitialStateClean"
8889
require := require.New(t)
89-
genesisDoc, _ := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, "TestInitialStateClean")
90+
genesisDoc, _ := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainID)
9091
genesis := &cmtypes.GenesisDoc{
91-
ChainID: "TestInitialStateClean",
92+
ChainID: chainID,
9293
InitialHeight: 1,
9394
Validators: genesisDoc.Validators,
9495
AppHash: []byte("app hash"),
@@ -458,16 +459,16 @@ func TestSubmitBlocksToMockDA(t *testing.T) {
458459

459460
// Test_submitBlocksToDA_BlockMarshalErrorCase1: A itself has a marshalling error. So A, B and C never get submitted.
460461
func Test_submitBlocksToDA_BlockMarshalErrorCase1(t *testing.T) {
461-
chainId := "Test_submitBlocksToDA_BlockMarshalErrorCase1"
462+
chainID := "Test_submitBlocksToDA_BlockMarshalErrorCase1"
462463
assert := assert.New(t)
463464
require := require.New(t)
464465
ctx := context.Background()
465466

466467
m := getManager(t, goDATest.NewDummyDA())
467468

468-
header1, data1 := types.GetRandomBlock(uint64(1), 5, chainId)
469-
header2, data2 := types.GetRandomBlock(uint64(2), 5, chainId)
470-
header3, data3 := types.GetRandomBlock(uint64(3), 5, chainId)
469+
header1, data1 := types.GetRandomBlock(uint64(1), 5, chainID)
470+
header2, data2 := types.GetRandomBlock(uint64(2), 5, chainID)
471+
header3, data3 := types.GetRandomBlock(uint64(3), 5, chainID)
471472

472473
store := mocks.NewStore(t)
473474
invalidateBlockHeader(header1)
@@ -493,16 +494,16 @@ func Test_submitBlocksToDA_BlockMarshalErrorCase1(t *testing.T) {
493494
// Test_submitBlocksToDA_BlockMarshalErrorCase2: A and B are fair blocks, but C has a marshalling error
494495
// - Block A and B get submitted to DA layer not block C
495496
func Test_submitBlocksToDA_BlockMarshalErrorCase2(t *testing.T) {
496-
chainId := "Test_submitBlocksToDA_BlockMarshalErrorCase2"
497+
chainID := "Test_submitBlocksToDA_BlockMarshalErrorCase2"
497498
assert := assert.New(t)
498499
require := require.New(t)
499500
ctx := context.Background()
500501

501502
m := getManager(t, goDATest.NewDummyDA())
502503

503-
header1, data1 := types.GetRandomBlock(uint64(1), 5, chainId)
504-
header2, data2 := types.GetRandomBlock(uint64(2), 5, chainId)
505-
header3, data3 := types.GetRandomBlock(uint64(3), 5, chainId)
504+
header1, data1 := types.GetRandomBlock(uint64(1), 5, chainID)
505+
header2, data2 := types.GetRandomBlock(uint64(2), 5, chainID)
506+
header3, data3 := types.GetRandomBlock(uint64(3), 5, chainID)
506507

507508
store := mocks.NewStore(t)
508509
invalidateBlockHeader(header3)
@@ -687,15 +688,15 @@ func TestManager_publishBlock(t *testing.T) {
687688
lastState.NextValidators = cmtypes.NewValidatorSet(validators)
688689
lastState.LastValidators = cmtypes.NewValidatorSet(validators)
689690

690-
chainId := "TestManager_publishBlock"
691+
chainID := "TestManager_publishBlock"
691692
mpool := mempool.NewCListMempool(cfg.DefaultMempoolConfig(), proxy.NewAppConnMempool(client, proxy.NopMetrics()), 0)
692693
seqClient := seqGRPC.NewClient()
693694
require.NoError(seqClient.Start(
694695
MockSequencerAddress,
695696
grpc.WithTransportCredentials(insecure.NewCredentials()),
696697
))
697-
mpoolReaper := mempool.NewCListMempoolReaper(mpool, []byte(chainId), seqClient, logger)
698-
executor := state.NewBlockExecutor(vKey.PubKey().Address(), chainId, mpool, mpoolReaper, proxy.NewAppConnConsensus(client, proxy.NopMetrics()), nil, 100, logger, state.NopMetrics())
698+
mpoolReaper := mempool.NewCListMempoolReaper(mpool, []byte(chainID), seqClient, logger)
699+
executor := state.NewBlockExecutor(vKey.PubKey().Address(), chainID, mpool, mpoolReaper, proxy.NewAppConnConsensus(client, proxy.NopMetrics()), nil, 100, logger, state.NopMetrics())
699700

700701
signingKey, err := types.PrivKeyToSigningKey(vKey)
701702
require.NoError(err)
@@ -708,7 +709,7 @@ func TestManager_publishBlock(t *testing.T) {
708709
store: mockStore,
709710
logger: mockLogger,
710711
genesis: &cmtypes.GenesisDoc{
711-
ChainID: chainId,
712+
ChainID: chainID,
712713
InitialHeight: 1,
713714
AppHash: []byte("app hash"),
714715
},

‎block/pending_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ func newPendingBlocks(t *testing.T) *PendingHeaders {
8585
return pendingBlocks
8686
}
8787

88-
func fillWithBlockData(ctx context.Context, t *testing.T, pb *PendingHeaders, chainId string) {
88+
func fillWithBlockData(ctx context.Context, t *testing.T, pb *PendingHeaders, chainID string) {
8989
for i := uint64(1); i <= numBlocks; i++ {
90-
h, d := types.GetRandomBlock(i, 0, chainId)
90+
h, d := types.GetRandomBlock(i, 0, chainID)
9191
require.NoError(t, pb.store.SaveBlockData(ctx, h, d, &types.Signature{}))
9292
pb.store.SetHeight(ctx, i)
9393
}

‎da/da_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ func TestMain(m *testing.M) {
6868
}
6969

7070
func TestMockDAErrors(t *testing.T) {
71-
chainId := "TestMockDAErrors"
71+
chainID := "TestMockDAErrors"
7272
t.Run("submit_timeout", func(t *testing.T) {
7373
mockDA := &damock.MockDA{}
7474
dalc := NewDAClient(mockDA, -1, -1, nil, nil, log.TestingLogger())
75-
header, _ := types.GetRandomBlock(1, 0, chainId)
75+
header, _ := types.GetRandomBlock(1, 0, chainID)
7676
headers := []*types.SignedHeader{header}
7777
var blobs []da.Blob
7878
for _, header := range headers {
@@ -98,7 +98,7 @@ func TestMockDAErrors(t *testing.T) {
9898
t.Run("tx_too_large", func(t *testing.T) {
9999
mockDA := &damock.MockDA{}
100100
dalc := NewDAClient(mockDA, -1, -1, nil, nil, log.TestingLogger())
101-
header, _ := types.GetRandomBlock(1, 0, chainId)
101+
header, _ := types.GetRandomBlock(1, 0, chainID)
102102
headers := []*types.SignedHeader{header}
103103
var blobs []da.Blob
104104
for _, header := range headers {
@@ -267,9 +267,9 @@ func doTestSubmitEmptyBlocks(t *testing.T, dalc *DAClient) {
267267

268268
assert := assert.New(t)
269269

270-
chainId := "doTestSubmitEmptyBlocks"
271-
header1, _ := types.GetRandomBlock(1, 0, chainId)
272-
header2, _ := types.GetRandomBlock(1, 0, chainId)
270+
chainID := "doTestSubmitEmptyBlocks"
271+
header1, _ := types.GetRandomBlock(1, 0, chainID)
272+
header2, _ := types.GetRandomBlock(1, 0, chainID)
273273
resp := dalc.SubmitHeaders(ctx, []*types.SignedHeader{header1, header2}, maxBlobSize, -1)
274274
assert.Equal(StatusSuccess, resp.Code, "empty blocks should submit")
275275
assert.EqualValues(resp.SubmittedCount, 2, "empty blocks should batch")
@@ -299,9 +299,9 @@ func doTestSubmitSmallBlocksBatch(t *testing.T, dalc *DAClient) {
299299

300300
assert := assert.New(t)
301301

302-
chainId := "doTestSubmitSmallBlocksBatch"
303-
header1, _ := types.GetRandomBlock(1, 1, chainId)
304-
header2, _ := types.GetRandomBlock(1, 2, chainId)
302+
chainID := "doTestSubmitSmallBlocksBatch"
303+
header1, _ := types.GetRandomBlock(1, 1, chainID)
304+
header2, _ := types.GetRandomBlock(1, 2, chainID)
305305
resp := dalc.SubmitHeaders(ctx, []*types.SignedHeader{header1, header2}, maxBlobSize, -1)
306306
assert.Equal(StatusSuccess, resp.Code, "small blocks should submit")
307307
assert.EqualValues(resp.SubmittedCount, 2, "small blocks should batch")

‎node/full_client_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ func getBlockMeta(rpc *FullClient, n int64) *cmtypes.BlockMeta {
5656
return bmeta
5757
}
5858

59-
func getRPC(t *testing.T, chainId string) (*mocks.Application, *FullClient) {
59+
func getRPC(t *testing.T, chainID string) (*mocks.Application, *FullClient) {
6060
t.Helper()
6161
require := require.New(t)
6262
app := &mocks.Application{}
6363
app.On("InitChain", mock.Anything, mock.Anything).Return(&abci.ResponseInitChain{}, nil)
6464
key, _, _ := crypto.GenerateEd25519Key(crand.Reader)
6565
ctx := context.Background()
66-
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainId)
66+
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainID)
6767
signingKey, err := types.PrivKeyToSigningKey(genesisValidatorKey)
6868
require.NoError(err)
6969
node, err := newFullNode(
@@ -308,15 +308,15 @@ func TestGetBlock(t *testing.T) {
308308
assert := assert.New(t)
309309
require := require.New(t)
310310

311-
chainId := "TestGetBlock"
312-
mockApp, rpc := getRPC(t, chainId)
311+
chainID := "TestGetBlock"
312+
mockApp, rpc := getRPC(t, chainID)
313313
mockApp.On("CheckTx", mock.Anything, mock.Anything).Return(&abci.ResponseCheckTx{}, nil)
314314
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
315315
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
316316

317317
startNodeWithCleanup(t, rpc.node)
318318
ctx := context.Background()
319-
header, data := types.GetRandomBlock(1, 10, chainId)
319+
header, data := types.GetRandomBlock(1, 10, chainID)
320320
err := rpc.node.Store.SaveBlockData(ctx, header, data, &types.Signature{})
321321
rpc.node.Store.SetHeight(ctx, header.Height())
322322
require.NoError(err)
@@ -329,17 +329,17 @@ func TestGetBlock(t *testing.T) {
329329
}
330330

331331
func TestGetCommit(t *testing.T) {
332-
chainId := "TestGetCommit"
332+
chainID := "TestGetCommit"
333333
require := require.New(t)
334334
assert := assert.New(t)
335-
mockApp, rpc := getRPC(t, chainId)
335+
mockApp, rpc := getRPC(t, chainID)
336336
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
337337
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
338338

339-
header1, data1 := types.GetRandomBlock(1, 5, chainId)
340-
header2, data2 := types.GetRandomBlock(2, 6, chainId)
341-
header3, data3 := types.GetRandomBlock(3, 8, chainId)
342-
header4, data4 := types.GetRandomBlock(4, 10, chainId)
339+
header1, data1 := types.GetRandomBlock(1, 5, chainID)
340+
header2, data2 := types.GetRandomBlock(2, 6, chainID)
341+
header3, data3 := types.GetRandomBlock(3, 8, chainID)
342+
header4, data4 := types.GetRandomBlock(4, 10, chainID)
343343
headers := []*types.SignedHeader{header1, header2, header3, header4}
344344
data := []*types.Data{data1, data2, data3, data4}
345345

@@ -370,10 +370,10 @@ func TestGetCommit(t *testing.T) {
370370
}
371371

372372
func TestCometBFTLightClientCompability(t *testing.T) {
373-
chainId := "TestCometBFTLightClientCompability"
373+
chainID := "TestCometBFTLightClientCompability"
374374
require := require.New(t)
375375
assert := assert.New(t)
376-
mockApp, rpc := getRPC(t, chainId)
376+
mockApp, rpc := getRPC(t, chainID)
377377
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
378378
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
379379

@@ -382,9 +382,9 @@ func TestCometBFTLightClientCompability(t *testing.T) {
382382
Height: 1,
383383
NTxs: 1,
384384
}
385-
header1, data1, privKey := types.GenerateRandomBlockCustom(&config, chainId)
386-
header2, data2 := types.GetRandomNextBlock(header1, data1, privKey, []byte{}, 2, chainId)
387-
header3, data3 := types.GetRandomNextBlock(header2, data2, privKey, []byte{}, 3, chainId)
385+
header1, data1, privKey := types.GenerateRandomBlockCustom(&config, chainID)
386+
header2, data2 := types.GetRandomNextBlock(header1, data1, privKey, []byte{}, 2, chainID)
387+
header3, data3 := types.GetRandomNextBlock(header2, data2, privKey, []byte{}, 3, chainID)
388388

389389
headers := []*types.SignedHeader{header1, header2, header3}
390390
data := []*types.Data{data1, data2, data3}
@@ -440,17 +440,17 @@ func TestCometBFTLightClientCompability(t *testing.T) {
440440
}
441441

442442
func TestBlockSearch(t *testing.T) {
443-
chainId := "TestBlockSearch"
443+
chainID := "TestBlockSearch"
444444
require := require.New(t)
445445
assert := assert.New(t)
446-
mockApp, rpc := getRPC(t, chainId)
446+
mockApp, rpc := getRPC(t, chainID)
447447
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
448448
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
449449

450450
ctx := context.Background()
451451
heights := []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
452452
for _, h := range heights {
453-
header, data := types.GetRandomBlock(uint64(h), 5, chainId)
453+
header, data := types.GetRandomBlock(uint64(h), 5, chainID)
454454
err := rpc.node.Store.SaveBlockData(ctx, header, data, &types.Signature{})
455455
require.NoError(err)
456456
}
@@ -499,18 +499,18 @@ func TestBlockSearch(t *testing.T) {
499499
}
500500

501501
func TestGetBlockByHash(t *testing.T) {
502-
chainId := "TestGetBlockByHash"
502+
chainID := "TestGetBlockByHash"
503503
assert := assert.New(t)
504504
require := require.New(t)
505505

506-
mockApp, rpc := getRPC(t, chainId)
506+
mockApp, rpc := getRPC(t, chainID)
507507
mockApp.On("CheckTx", mock.Anything, mock.Anything).Return(&abci.ResponseCheckTx{}, nil)
508508
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
509509
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
510510

511511
startNodeWithCleanup(t, rpc.node)
512512
ctx := context.Background()
513-
header, data := types.GetRandomBlock(1, 10, chainId)
513+
header, data := types.GetRandomBlock(1, 10, chainID)
514514
err := rpc.node.Store.SaveBlockData(ctx, header, data, &types.Signature{})
515515
require.NoError(err)
516516
abciBlock, err := abciconv.ToABCIBlock(header, data)
@@ -702,17 +702,17 @@ func TestConsensusState(t *testing.T) {
702702
}
703703

704704
func TestBlockchainInfo(t *testing.T) {
705-
chainId := "TestBlockchainInfo"
705+
chainID := "TestBlockchainInfo"
706706
require := require.New(t)
707707
assert := assert.New(t)
708-
mockApp, rpc := getRPC(t, chainId)
708+
mockApp, rpc := getRPC(t, chainID)
709709
mockApp.On("FinalizeBlock", mock.Anything, mock.Anything).Return(finalizeBlockResponse)
710710
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
711711
ctx := context.Background()
712712

713713
heights := []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
714714
for _, h := range heights {
715-
header, data := types.GetRandomBlock(uint64(h), 5, chainId)
715+
header, data := types.GetRandomBlock(uint64(h), 5, chainID)
716716
err := rpc.node.Store.SaveBlockData(ctx, header, data, &types.Signature{})
717717
rpc.node.Store.SetHeight(ctx, header.Height())
718718
require.NoError(err)
@@ -881,7 +881,7 @@ func TestMempool2Nodes(t *testing.T) {
881881
}
882882

883883
func TestStatus(t *testing.T) {
884-
chainId := "TestStatus"
884+
chainID := "TestStatus"
885885
assert := assert.New(t)
886886
require := require.New(t)
887887

@@ -890,7 +890,7 @@ func TestStatus(t *testing.T) {
890890
app.On("PrepareProposal", mock.Anything, mock.Anything).Return(prepareProposalResponse).Maybe()
891891
app.On("ProcessProposal", mock.Anything, mock.Anything).Return(&abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}, nil)
892892
key, _, _ := crypto.GenerateEd25519Key(crand.Reader)
893-
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainId)
893+
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainID)
894894
signingKey, err := types.PrivKeyToSigningKey(genesisValidatorKey)
895895
require.NoError(err)
896896
pubKey := genesisDoc.Validators[0].PubKey
@@ -938,7 +938,7 @@ func TestStatus(t *testing.T) {
938938
NTxs: 1,
939939
ProposerAddr: pubKey.Bytes(),
940940
}
941-
earliestHeader, earliestData, _ := types.GenerateRandomBlockCustom(&config, chainId)
941+
earliestHeader, earliestData, _ := types.GenerateRandomBlockCustom(&config, chainID)
942942
err = rpc.node.Store.SaveBlockData(ctx, earliestHeader, earliestData, &types.Signature{})
943943
rpc.node.Store.SetHeight(ctx, earliestHeader.Height())
944944
require.NoError(err)
@@ -948,7 +948,7 @@ func TestStatus(t *testing.T) {
948948
NTxs: 1,
949949
ProposerAddr: pubKey.Bytes(),
950950
}
951-
latestHeader, latestData, _ := types.GenerateRandomBlockCustom(&config, chainId)
951+
latestHeader, latestData, _ := types.GenerateRandomBlockCustom(&config, chainID)
952952
err = rpc.node.Store.SaveBlockData(ctx, latestHeader, latestData, &types.Signature{})
953953
rpc.node.Store.SetHeight(ctx, latestHeader.Height())
954954
require.NoError(err)
@@ -1035,8 +1035,8 @@ func TestFutureGenesisTime(t *testing.T) {
10351035
mockApp.On("Commit", mock.Anything, mock.Anything).Return(&abci.ResponseCommit{}, nil)
10361036
mockApp.On("CheckTx", mock.Anything, mock.Anything).Return(&abci.ResponseCheckTx{}, nil)
10371037
key, _, _ := crypto.GenerateEd25519Key(crand.Reader)
1038-
chainId := "TestFutureGenesisTime"
1039-
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainId)
1038+
chainID := "TestFutureGenesisTime"
1039+
genesisDoc, genesisValidatorKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, chainID)
10401040
signingKey, err := types.PrivKeyToSigningKey(genesisValidatorKey)
10411041
require.NoError(err)
10421042

@@ -1057,7 +1057,7 @@ func TestFutureGenesisTime(t *testing.T) {
10571057
key, signingKey,
10581058
proxy.NewLocalClientCreator(mockApp),
10591059
&cmtypes.GenesisDoc{
1060-
ChainID: chainId,
1060+
ChainID: chainID,
10611061
InitialHeight: 1,
10621062
GenesisTime: genesisTime,
10631063
Validators: genesisDoc.Validators,

0 commit comments

Comments
 (0)