@@ -569,11 +569,11 @@ func testInsertNonceError(t *testing.T, full bool) {
569
569
func TestFastVsFullChains (t * testing.T ) {
570
570
// Configure and generate a sample block chain
571
571
var (
572
- gendb , _ = ethdb .NewMemDatabase ()
573
- key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
574
- address = crypto .PubkeyToAddress (key .PublicKey )
575
- funds = big .NewInt (1000000000 )
576
- gspec = & Genesis {
572
+ gendb = ethdb .NewMemDatabase ()
573
+ key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
574
+ address = crypto .PubkeyToAddress (key .PublicKey )
575
+ funds = big .NewInt (1000000000 )
576
+ gspec = & Genesis {
577
577
Config : params .TestChainConfig ,
578
578
Alloc : GenesisAlloc {address : {Balance : funds }},
579
579
}
@@ -599,7 +599,7 @@ func TestFastVsFullChains(t *testing.T) {
599
599
}
600
600
})
601
601
// Import the chain as an archive node for the comparison baseline
602
- archiveDb , _ := ethdb .NewMemDatabase ()
602
+ archiveDb := ethdb .NewMemDatabase ()
603
603
gspec .MustCommit (archiveDb )
604
604
archive , _ := NewBlockChain (archiveDb , nil , gspec .Config , ethash .NewFaker (), vm.Config {})
605
605
defer archive .Stop ()
@@ -608,7 +608,7 @@ func TestFastVsFullChains(t *testing.T) {
608
608
t .Fatalf ("failed to process block %d: %v" , n , err )
609
609
}
610
610
// Fast import the chain as a non-archive node to test
611
- fastDb , _ := ethdb .NewMemDatabase ()
611
+ fastDb := ethdb .NewMemDatabase ()
612
612
gspec .MustCommit (fastDb )
613
613
fast , _ := NewBlockChain (fastDb , nil , gspec .Config , ethash .NewFaker (), vm.Config {})
614
614
defer fast .Stop ()
@@ -657,12 +657,12 @@ func TestFastVsFullChains(t *testing.T) {
657
657
func TestLightVsFastVsFullChainHeads (t * testing.T ) {
658
658
// Configure and generate a sample block chain
659
659
var (
660
- gendb , _ = ethdb .NewMemDatabase ()
661
- key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
662
- address = crypto .PubkeyToAddress (key .PublicKey )
663
- funds = big .NewInt (1000000000 )
664
- gspec = & Genesis {Config : params .TestChainConfig , Alloc : GenesisAlloc {address : {Balance : funds }}}
665
- genesis = gspec .MustCommit (gendb )
660
+ gendb = ethdb .NewMemDatabase ()
661
+ key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
662
+ address = crypto .PubkeyToAddress (key .PublicKey )
663
+ funds = big .NewInt (1000000000 )
664
+ gspec = & Genesis {Config : params .TestChainConfig , Alloc : GenesisAlloc {address : {Balance : funds }}}
665
+ genesis = gspec .MustCommit (gendb )
666
666
)
667
667
height := uint64 (1024 )
668
668
blocks , receipts := GenerateChain (gspec .Config , genesis , ethash .NewFaker (), gendb , int (height ), nil )
@@ -685,7 +685,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
685
685
}
686
686
}
687
687
// Import the chain as an archive node and ensure all pointers are updated
688
- archiveDb , _ := ethdb .NewMemDatabase ()
688
+ archiveDb := ethdb .NewMemDatabase ()
689
689
gspec .MustCommit (archiveDb )
690
690
691
691
archive , _ := NewBlockChain (archiveDb , nil , gspec .Config , ethash .NewFaker (), vm.Config {})
@@ -699,7 +699,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
699
699
assert (t , "archive" , archive , height / 2 , height / 2 , height / 2 )
700
700
701
701
// Import the chain as a non-archive node and ensure all pointers are updated
702
- fastDb , _ := ethdb .NewMemDatabase ()
702
+ fastDb := ethdb .NewMemDatabase ()
703
703
gspec .MustCommit (fastDb )
704
704
fast , _ := NewBlockChain (fastDb , nil , gspec .Config , ethash .NewFaker (), vm.Config {})
705
705
defer fast .Stop ()
@@ -719,7 +719,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
719
719
assert (t , "fast" , fast , height / 2 , height / 2 , 0 )
720
720
721
721
// Import the chain as a light node and ensure all pointers are updated
722
- lightDb , _ := ethdb .NewMemDatabase ()
722
+ lightDb := ethdb .NewMemDatabase ()
723
723
gspec .MustCommit (lightDb )
724
724
725
725
light , _ := NewBlockChain (lightDb , nil , gspec .Config , ethash .NewFaker (), vm.Config {})
@@ -742,7 +742,7 @@ func TestChainTxReorgs(t *testing.T) {
742
742
addr1 = crypto .PubkeyToAddress (key1 .PublicKey )
743
743
addr2 = crypto .PubkeyToAddress (key2 .PublicKey )
744
744
addr3 = crypto .PubkeyToAddress (key3 .PublicKey )
745
- db , _ = ethdb .NewMemDatabase ()
745
+ db = ethdb .NewMemDatabase ()
746
746
gspec = & Genesis {
747
747
Config : params .TestChainConfig ,
748
748
GasLimit : 3141592 ,
@@ -854,7 +854,7 @@ func TestLogReorgs(t *testing.T) {
854
854
var (
855
855
key1 , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
856
856
addr1 = crypto .PubkeyToAddress (key1 .PublicKey )
857
- db , _ = ethdb .NewMemDatabase ()
857
+ db = ethdb .NewMemDatabase ()
858
858
// this code generates a log
859
859
code = common .Hex2Bytes ("60606040525b7f24ec1d3ff24c2f6ff210738839dbc339cd45a5294d85c79361016243157aae7b60405180905060405180910390a15b600a8060416000396000f360606040526008565b00" )
860
860
gspec = & Genesis {Config : params .TestChainConfig , Alloc : GenesisAlloc {addr1 : {Balance : big .NewInt (10000000000000 )}}}
@@ -898,7 +898,7 @@ func TestLogReorgs(t *testing.T) {
898
898
899
899
func TestReorgSideEvent (t * testing.T ) {
900
900
var (
901
- db , _ = ethdb .NewMemDatabase ()
901
+ db = ethdb .NewMemDatabase ()
902
902
key1 , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
903
903
addr1 = crypto .PubkeyToAddress (key1 .PublicKey )
904
904
gspec = & Genesis {
@@ -1026,7 +1026,7 @@ func TestCanonicalBlockRetrieval(t *testing.T) {
1026
1026
func TestEIP155Transition (t * testing.T ) {
1027
1027
// Configure and generate a sample block chain
1028
1028
var (
1029
- db , _ = ethdb .NewMemDatabase ()
1029
+ db = ethdb .NewMemDatabase ()
1030
1030
key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
1031
1031
address = crypto .PubkeyToAddress (key .PublicKey )
1032
1032
funds = big .NewInt (1000000000 )
@@ -1130,7 +1130,7 @@ func TestEIP155Transition(t *testing.T) {
1130
1130
func TestEIP161AccountRemoval (t * testing.T ) {
1131
1131
// Configure and generate a sample block chain
1132
1132
var (
1133
- db , _ = ethdb .NewMemDatabase ()
1133
+ db = ethdb .NewMemDatabase ()
1134
1134
key , _ = crypto .HexToECDSA ("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291" )
1135
1135
address = crypto .PubkeyToAddress (key .PublicKey )
1136
1136
funds = big .NewInt (1000000000 )
@@ -1202,7 +1202,7 @@ func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
1202
1202
// Generate a canonical chain to act as the main dataset
1203
1203
engine := ethash .NewFaker ()
1204
1204
1205
- db , _ := ethdb .NewMemDatabase ()
1205
+ db := ethdb .NewMemDatabase ()
1206
1206
genesis := new (Genesis ).MustCommit (db )
1207
1207
blocks , _ := GenerateChain (params .TestChainConfig , genesis , engine , db , 64 , func (i int , b * BlockGen ) { b .SetCoinbase (common.Address {1 }) })
1208
1208
@@ -1218,7 +1218,7 @@ func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
1218
1218
}
1219
1219
// Import the canonical and fork chain side by side, verifying the current block
1220
1220
// and current header consistency
1221
- diskdb , _ := ethdb .NewMemDatabase ()
1221
+ diskdb := ethdb .NewMemDatabase ()
1222
1222
new (Genesis ).MustCommit (diskdb )
1223
1223
1224
1224
chain , err := NewBlockChain (diskdb , nil , params .TestChainConfig , engine , vm.Config {})
@@ -1247,7 +1247,7 @@ func TestTrieForkGC(t *testing.T) {
1247
1247
// Generate a canonical chain to act as the main dataset
1248
1248
engine := ethash .NewFaker ()
1249
1249
1250
- db , _ := ethdb .NewMemDatabase ()
1250
+ db := ethdb .NewMemDatabase ()
1251
1251
genesis := new (Genesis ).MustCommit (db )
1252
1252
blocks , _ := GenerateChain (params .TestChainConfig , genesis , engine , db , 2 * triesInMemory , func (i int , b * BlockGen ) { b .SetCoinbase (common.Address {1 }) })
1253
1253
@@ -1262,7 +1262,7 @@ func TestTrieForkGC(t *testing.T) {
1262
1262
forks [i ] = fork [0 ]
1263
1263
}
1264
1264
// Import the canonical and fork chain side by side, forcing the trie cache to cache both
1265
- diskdb , _ := ethdb .NewMemDatabase ()
1265
+ diskdb := ethdb .NewMemDatabase ()
1266
1266
new (Genesis ).MustCommit (diskdb )
1267
1267
1268
1268
chain , err := NewBlockChain (diskdb , nil , params .TestChainConfig , engine , vm.Config {})
@@ -1293,15 +1293,15 @@ func TestLargeReorgTrieGC(t *testing.T) {
1293
1293
// Generate the original common chain segment and the two competing forks
1294
1294
engine := ethash .NewFaker ()
1295
1295
1296
- db , _ := ethdb .NewMemDatabase ()
1296
+ db := ethdb .NewMemDatabase ()
1297
1297
genesis := new (Genesis ).MustCommit (db )
1298
1298
1299
1299
shared , _ := GenerateChain (params .TestChainConfig , genesis , engine , db , 64 , func (i int , b * BlockGen ) { b .SetCoinbase (common.Address {1 }) })
1300
1300
original , _ := GenerateChain (params .TestChainConfig , shared [len (shared )- 1 ], engine , db , 2 * triesInMemory , func (i int , b * BlockGen ) { b .SetCoinbase (common.Address {2 }) })
1301
1301
competitor , _ := GenerateChain (params .TestChainConfig , shared [len (shared )- 1 ], engine , db , 2 * triesInMemory + 1 , func (i int , b * BlockGen ) { b .SetCoinbase (common.Address {3 }) })
1302
1302
1303
1303
// Import the shared chain and the original canonical one
1304
- diskdb , _ := ethdb .NewMemDatabase ()
1304
+ diskdb := ethdb .NewMemDatabase ()
1305
1305
new (Genesis ).MustCommit (diskdb )
1306
1306
1307
1307
chain , err := NewBlockChain (diskdb , nil , params .TestChainConfig , engine , vm.Config {})
@@ -1361,7 +1361,7 @@ func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks in
1361
1361
)
1362
1362
// Generate the original common chain segment and the two competing forks
1363
1363
engine := ethash .NewFaker ()
1364
- db , _ := ethdb .NewMemDatabase ()
1364
+ db := ethdb .NewMemDatabase ()
1365
1365
genesis := gspec .MustCommit (db )
1366
1366
1367
1367
blockGenerator := func (i int , block * BlockGen ) {
@@ -1383,7 +1383,7 @@ func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks in
1383
1383
b .ResetTimer ()
1384
1384
for i := 0 ; i < b .N ; i ++ {
1385
1385
// Import the shared chain and the original canonical one
1386
- diskdb , _ := ethdb .NewMemDatabase ()
1386
+ diskdb := ethdb .NewMemDatabase ()
1387
1387
gspec .MustCommit (diskdb )
1388
1388
1389
1389
chain , err := NewBlockChain (diskdb , nil , params .TestChainConfig , engine , vm.Config {})
0 commit comments