Skip to content

Commit 3a6b23e

Browse files
arnaubennassararnaubennassar
committed
Fix NewBlock panic
1 parent 9f73108 commit 3a6b23e

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎jsonrpc/endpoints_eth_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -986,11 +986,11 @@ func TestGetL2BlockByHash(t *testing.T) {
986986
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
987987
nil,
988988
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
989-
&trie.StackTrie{},
989+
trie.NewStackTrie(nil),
990990
),
991991
ExpectedError: nil,
992992
SetupMocks: func(m *mocksWrapper, tc *testCase) {
993-
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(), tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, &trie.StackTrie{})
993+
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(), tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, trie.NewStackTrie(nil))
994994

995995
m.DbTx.
996996
On("Commit", context.Background()).
@@ -1085,12 +1085,12 @@ func TestGetL2BlockByNumber(t *testing.T) {
10851085
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
10861086
nil,
10871087
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
1088-
&trie.StackTrie{},
1088+
trie.NewStackTrie(nil),
10891089
),
10901090
ExpectedError: nil,
10911091
SetupMocks: func(m *mocksWrapper, tc *testCase) {
10921092
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(),
1093-
tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, &trie.StackTrie{})
1093+
tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, trie.NewStackTrie(nil))
10941094

10951095
m.DbTx.
10961096
On("Commit", context.Background()).
@@ -1123,7 +1123,7 @@ func TestGetL2BlockByNumber(t *testing.T) {
11231123
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
11241124
nil,
11251125
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
1126-
&trie.StackTrie{},
1126+
trie.NewStackTrie(nil),
11271127
),
11281128
ExpectedError: nil,
11291129
SetupMocks: func(m *mocksWrapper, tc *testCase) {
@@ -1207,16 +1207,16 @@ func TestGetL2BlockByNumber(t *testing.T) {
12071207
{
12081208
Name: "get pending block successfully",
12091209
Number: big.NewInt(-1),
1210-
ExpectedResult: ethTypes.NewBlock(&ethTypes.Header{Number: big.NewInt(2)}, nil, nil, nil, &trie.StackTrie{}),
1210+
ExpectedResult: ethTypes.NewBlock(&ethTypes.Header{Number: big.NewInt(2)}, nil, nil, nil, trie.NewStackTrie(nil)),
12111211
ExpectedError: nil,
12121212
SetupMocks: func(m *mocksWrapper, tc *testCase) {
12131213
lastBlockHeader := ethTypes.CopyHeader(tc.ExpectedResult.Header())
12141214
lastBlockHeader.Number.Sub(lastBlockHeader.Number, big.NewInt(1))
1215-
lastBlock := ethTypes.NewBlock(lastBlockHeader, nil, nil, nil, &trie.StackTrie{})
1215+
lastBlock := ethTypes.NewBlock(lastBlockHeader, nil, nil, nil, trie.NewStackTrie(nil))
12161216

12171217
expectedResultHeader := ethTypes.CopyHeader(tc.ExpectedResult.Header())
12181218
expectedResultHeader.ParentHash = lastBlock.Hash()
1219-
tc.ExpectedResult = ethTypes.NewBlock(expectedResultHeader, nil, nil, nil, &trie.StackTrie{})
1219+
tc.ExpectedResult = ethTypes.NewBlock(expectedResultHeader, nil, nil, nil, trie.NewStackTrie(nil))
12201220

12211221
m.DbTx.
12221222
On("Commit", context.Background()).

‎jsonrpc/endpoints_zkevm_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -1230,11 +1230,11 @@ func TestGetL2FullBlockByHash(t *testing.T) {
12301230
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
12311231
nil,
12321232
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
1233-
&trie.StackTrie{},
1233+
trie.NewStackTrie(nil),
12341234
),
12351235
ExpectedError: nil,
12361236
SetupMocks: func(m *mocksWrapper, tc *testCase) {
1237-
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(), tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, &trie.StackTrie{})
1237+
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(), tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, trie.NewStackTrie(nil))
12381238

12391239
m.DbTx.
12401240
On("Commit", context.Background()).
@@ -1336,12 +1336,12 @@ func TestGetL2FullBlockByNumber(t *testing.T) {
13361336
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
13371337
nil,
13381338
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
1339-
&trie.StackTrie{},
1339+
trie.NewStackTrie(nil),
13401340
),
13411341
ExpectedError: nil,
13421342
SetupMocks: func(m *mocksWrapper, tc *testCase) {
13431343
block := ethTypes.NewBlock(ethTypes.CopyHeader(tc.ExpectedResult.Header()), tc.ExpectedResult.Transactions(),
1344-
tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, &trie.StackTrie{})
1344+
tc.ExpectedResult.Uncles(), []*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))}, trie.NewStackTrie(nil))
13451345

13461346
m.DbTx.
13471347
On("Commit", context.Background()).
@@ -1374,7 +1374,7 @@ func TestGetL2FullBlockByNumber(t *testing.T) {
13741374
[]*ethTypes.Transaction{ethTypes.NewTransaction(1, common.Address{}, big.NewInt(1), 1, big.NewInt(1), []byte{})},
13751375
nil,
13761376
[]*ethTypes.Receipt{ethTypes.NewReceipt([]byte{}, false, uint64(0))},
1377-
&trie.StackTrie{},
1377+
trie.NewStackTrie(nil),
13781378
),
13791379
ExpectedError: nil,
13801380
SetupMocks: func(m *mocksWrapper, tc *testCase) {
@@ -1460,16 +1460,16 @@ func TestGetL2FullBlockByNumber(t *testing.T) {
14601460
{
14611461
Name: "get pending block successfully",
14621462
Number: "pending",
1463-
ExpectedResult: ethTypes.NewBlock(&ethTypes.Header{Number: big.NewInt(2)}, nil, nil, nil, &trie.StackTrie{}),
1463+
ExpectedResult: ethTypes.NewBlock(&ethTypes.Header{Number: big.NewInt(2)}, nil, nil, nil, trie.NewStackTrie(nil)),
14641464
ExpectedError: nil,
14651465
SetupMocks: func(m *mocksWrapper, tc *testCase) {
14661466
lastBlockHeader := ethTypes.CopyHeader(tc.ExpectedResult.Header())
14671467
lastBlockHeader.Number.Sub(lastBlockHeader.Number, big.NewInt(1))
1468-
lastBlock := ethTypes.NewBlock(lastBlockHeader, nil, nil, nil, &trie.StackTrie{})
1468+
lastBlock := ethTypes.NewBlock(lastBlockHeader, nil, nil, nil, trie.NewStackTrie(nil))
14691469

14701470
expectedResultHeader := ethTypes.CopyHeader(tc.ExpectedResult.Header())
14711471
expectedResultHeader.ParentHash = lastBlock.Hash()
1472-
tc.ExpectedResult = ethTypes.NewBlock(expectedResultHeader, nil, nil, nil, &trie.StackTrie{})
1472+
tc.ExpectedResult = ethTypes.NewBlock(expectedResultHeader, nil, nil, nil, trie.NewStackTrie(nil))
14731473

14741474
m.DbTx.
14751475
On("Commit", context.Background()).

‎state/pgstatestorage_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestGetBatchByL2BlockNumber(t *testing.T) {
7979
receipts := []*types.Receipt{receipt}
8080

8181
// Create block to be able to calculate its hash
82-
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, &trie.StackTrie{})
82+
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, trie.NewStackTrie(nil))
8383
receipt.BlockHash = l2Block.Hash()
8484

8585
err = pgStateStorage.AddL2Block(ctx, batchNumber, l2Block, receipts, state.MaxEffectivePercentage, dbTx)

‎state/state_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ func TestExecutorRevert(t *testing.T) {
878878
transactions := []*types.Transaction{signedTx0, signedTx1}
879879

880880
// Create block to be able to calculate its hash
881-
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, &trie.StackTrie{})
881+
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, trie.NewStackTrie(nil))
882882
l2Block.ReceivedAt = time.Now()
883883

884884
receipt.BlockHash = l2Block.Hash()
@@ -1718,7 +1718,7 @@ func TestAddGetL2Block(t *testing.T) {
17181718
receipts := []*types.Receipt{receipt}
17191719

17201720
// Create block to be able to calculate its hash
1721-
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, &trie.StackTrie{})
1721+
l2Block := types.NewBlock(header, transactions, []*types.Header{}, receipts, trie.NewStackTrie(nil))
17221722
l2Block.ReceivedAt = time
17231723

17241724
receipt.BlockHash = l2Block.Hash()

0 commit comments

Comments
 (0)