Skip to content

Commit 7beccb2

Browse files
rjl493456442karalabe
rjl493456442
authored and
karalabe
committed
all: get rid of error when creating memory database (#16716)
* all: get rid of error when create mdb * core: clean up variables definition * all: inline mdb definition
1 parent 5dbd8b4 commit 7beccb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+172
-230
lines changed

‎accounts/abi/bind/backends/simulated.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ type SimulatedBackend struct {
6666
// NewSimulatedBackend creates a new binding backend using a simulated blockchain
6767
// for testing purposes.
6868
func NewSimulatedBackend(alloc core.GenesisAlloc) *SimulatedBackend {
69-
database, _ := ethdb.NewMemDatabase()
69+
database := ethdb.NewMemDatabase()
7070
genesis := core.Genesis{Config: params.AllEthashProtocolChanges, Alloc: alloc}
7171
genesis.MustCommit(database)
7272
blockchain, _ := core.NewBlockChain(database, nil, genesis.Config, ethash.NewFaker(), vm.Config{})

‎cmd/evm/runner.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,13 @@ func runCmd(ctx *cli.Context) error {
9898
}
9999
if ctx.GlobalString(GenesisFlag.Name) != "" {
100100
gen := readGenesis(ctx.GlobalString(GenesisFlag.Name))
101-
db, _ := ethdb.NewMemDatabase()
101+
db := ethdb.NewMemDatabase()
102102
genesis := gen.ToBlock(db)
103103
statedb, _ = state.New(genesis.Root(), state.NewDatabase(db))
104104
chainConfig = gen.Config
105105
blockNumber = gen.Number
106106
} else {
107-
db, _ := ethdb.NewMemDatabase()
108-
statedb, _ = state.New(common.Hash{}, state.NewDatabase(db))
107+
statedb, _ = state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase()))
109108
}
110109
if ctx.GlobalString(SenderFlag.Name) != "" {
111110
sender = common.HexToAddress(ctx.GlobalString(SenderFlag.Name))

‎consensus/clique/snapshot_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ func TestVoting(t *testing.T) {
352352
copy(genesis.ExtraData[extraVanity+j*common.AddressLength:], signer[:])
353353
}
354354
// Create a pristine blockchain with the genesis injected
355-
db, _ := ethdb.NewMemDatabase()
355+
db := ethdb.NewMemDatabase()
356356
genesis.Commit(db)
357357

358358
// Assemble a chain of headers from the cast votes

‎core/bench_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func benchInsertChain(b *testing.B, disk bool, gen func(int, *BlockGen)) {
149149
// Create the database in memory or in a temporary directory.
150150
var db ethdb.Database
151151
if !disk {
152-
db, _ = ethdb.NewMemDatabase()
152+
db = ethdb.NewMemDatabase()
153153
} else {
154154
dir, err := ioutil.TempDir("", "eth-core-bench")
155155
if err != nil {

‎core/block_validator_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
func TestHeaderVerification(t *testing.T) {
3333
// Create a simple chain to verify
3434
var (
35-
testdb, _ = ethdb.NewMemDatabase()
35+
testdb = ethdb.NewMemDatabase()
3636
gspec = &Genesis{Config: params.TestChainConfig}
3737
genesis = gspec.MustCommit(testdb)
3838
blocks, _ = GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), testdb, 8, nil)
@@ -84,7 +84,7 @@ func TestHeaderConcurrentVerification32(t *testing.T) { testHeaderConcurrentVeri
8484
func testHeaderConcurrentVerification(t *testing.T, threads int) {
8585
// Create a simple chain to verify
8686
var (
87-
testdb, _ = ethdb.NewMemDatabase()
87+
testdb = ethdb.NewMemDatabase()
8888
gspec = &Genesis{Config: params.TestChainConfig}
8989
genesis = gspec.MustCommit(testdb)
9090
blocks, _ = GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), testdb, 8, nil)
@@ -156,7 +156,7 @@ func TestHeaderConcurrentAbortion32(t *testing.T) { testHeaderConcurrentAbortion
156156
func testHeaderConcurrentAbortion(t *testing.T, threads int) {
157157
// Create a simple chain to verify
158158
var (
159-
testdb, _ = ethdb.NewMemDatabase()
159+
testdb = ethdb.NewMemDatabase()
160160
gspec = &Genesis{Config: params.TestChainConfig}
161161
genesis = gspec.MustCommit(testdb)
162162
blocks, _ = GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), testdb, 1024, nil)

‎core/blockchain_test.go‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -569,11 +569,11 @@ func testInsertNonceError(t *testing.T, full bool) {
569569
func TestFastVsFullChains(t *testing.T) {
570570
// Configure and generate a sample block chain
571571
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{
577577
Config: params.TestChainConfig,
578578
Alloc: GenesisAlloc{address: {Balance: funds}},
579579
}
@@ -599,7 +599,7 @@ func TestFastVsFullChains(t *testing.T) {
599599
}
600600
})
601601
// Import the chain as an archive node for the comparison baseline
602-
archiveDb, _ := ethdb.NewMemDatabase()
602+
archiveDb := ethdb.NewMemDatabase()
603603
gspec.MustCommit(archiveDb)
604604
archive, _ := NewBlockChain(archiveDb, nil, gspec.Config, ethash.NewFaker(), vm.Config{})
605605
defer archive.Stop()
@@ -608,7 +608,7 @@ func TestFastVsFullChains(t *testing.T) {
608608
t.Fatalf("failed to process block %d: %v", n, err)
609609
}
610610
// Fast import the chain as a non-archive node to test
611-
fastDb, _ := ethdb.NewMemDatabase()
611+
fastDb := ethdb.NewMemDatabase()
612612
gspec.MustCommit(fastDb)
613613
fast, _ := NewBlockChain(fastDb, nil, gspec.Config, ethash.NewFaker(), vm.Config{})
614614
defer fast.Stop()
@@ -657,12 +657,12 @@ func TestFastVsFullChains(t *testing.T) {
657657
func TestLightVsFastVsFullChainHeads(t *testing.T) {
658658
// Configure and generate a sample block chain
659659
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)
666666
)
667667
height := uint64(1024)
668668
blocks, receipts := GenerateChain(gspec.Config, genesis, ethash.NewFaker(), gendb, int(height), nil)
@@ -685,7 +685,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
685685
}
686686
}
687687
// Import the chain as an archive node and ensure all pointers are updated
688-
archiveDb, _ := ethdb.NewMemDatabase()
688+
archiveDb := ethdb.NewMemDatabase()
689689
gspec.MustCommit(archiveDb)
690690

691691
archive, _ := NewBlockChain(archiveDb, nil, gspec.Config, ethash.NewFaker(), vm.Config{})
@@ -699,7 +699,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
699699
assert(t, "archive", archive, height/2, height/2, height/2)
700700

701701
// Import the chain as a non-archive node and ensure all pointers are updated
702-
fastDb, _ := ethdb.NewMemDatabase()
702+
fastDb := ethdb.NewMemDatabase()
703703
gspec.MustCommit(fastDb)
704704
fast, _ := NewBlockChain(fastDb, nil, gspec.Config, ethash.NewFaker(), vm.Config{})
705705
defer fast.Stop()
@@ -719,7 +719,7 @@ func TestLightVsFastVsFullChainHeads(t *testing.T) {
719719
assert(t, "fast", fast, height/2, height/2, 0)
720720

721721
// Import the chain as a light node and ensure all pointers are updated
722-
lightDb, _ := ethdb.NewMemDatabase()
722+
lightDb := ethdb.NewMemDatabase()
723723
gspec.MustCommit(lightDb)
724724

725725
light, _ := NewBlockChain(lightDb, nil, gspec.Config, ethash.NewFaker(), vm.Config{})
@@ -742,7 +742,7 @@ func TestChainTxReorgs(t *testing.T) {
742742
addr1 = crypto.PubkeyToAddress(key1.PublicKey)
743743
addr2 = crypto.PubkeyToAddress(key2.PublicKey)
744744
addr3 = crypto.PubkeyToAddress(key3.PublicKey)
745-
db, _ = ethdb.NewMemDatabase()
745+
db = ethdb.NewMemDatabase()
746746
gspec = &Genesis{
747747
Config: params.TestChainConfig,
748748
GasLimit: 3141592,
@@ -854,7 +854,7 @@ func TestLogReorgs(t *testing.T) {
854854
var (
855855
key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
856856
addr1 = crypto.PubkeyToAddress(key1.PublicKey)
857-
db, _ = ethdb.NewMemDatabase()
857+
db = ethdb.NewMemDatabase()
858858
// this code generates a log
859859
code = common.Hex2Bytes("60606040525b7f24ec1d3ff24c2f6ff210738839dbc339cd45a5294d85c79361016243157aae7b60405180905060405180910390a15b600a8060416000396000f360606040526008565b00")
860860
gspec = &Genesis{Config: params.TestChainConfig, Alloc: GenesisAlloc{addr1: {Balance: big.NewInt(10000000000000)}}}
@@ -898,7 +898,7 @@ func TestLogReorgs(t *testing.T) {
898898

899899
func TestReorgSideEvent(t *testing.T) {
900900
var (
901-
db, _ = ethdb.NewMemDatabase()
901+
db = ethdb.NewMemDatabase()
902902
key1, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
903903
addr1 = crypto.PubkeyToAddress(key1.PublicKey)
904904
gspec = &Genesis{
@@ -1026,7 +1026,7 @@ func TestCanonicalBlockRetrieval(t *testing.T) {
10261026
func TestEIP155Transition(t *testing.T) {
10271027
// Configure and generate a sample block chain
10281028
var (
1029-
db, _ = ethdb.NewMemDatabase()
1029+
db = ethdb.NewMemDatabase()
10301030
key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
10311031
address = crypto.PubkeyToAddress(key.PublicKey)
10321032
funds = big.NewInt(1000000000)
@@ -1130,7 +1130,7 @@ func TestEIP155Transition(t *testing.T) {
11301130
func TestEIP161AccountRemoval(t *testing.T) {
11311131
// Configure and generate a sample block chain
11321132
var (
1133-
db, _ = ethdb.NewMemDatabase()
1133+
db = ethdb.NewMemDatabase()
11341134
key, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
11351135
address = crypto.PubkeyToAddress(key.PublicKey)
11361136
funds = big.NewInt(1000000000)
@@ -1202,7 +1202,7 @@ func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
12021202
// Generate a canonical chain to act as the main dataset
12031203
engine := ethash.NewFaker()
12041204

1205-
db, _ := ethdb.NewMemDatabase()
1205+
db := ethdb.NewMemDatabase()
12061206
genesis := new(Genesis).MustCommit(db)
12071207
blocks, _ := GenerateChain(params.TestChainConfig, genesis, engine, db, 64, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) })
12081208

@@ -1218,7 +1218,7 @@ func TestBlockchainHeaderchainReorgConsistency(t *testing.T) {
12181218
}
12191219
// Import the canonical and fork chain side by side, verifying the current block
12201220
// and current header consistency
1221-
diskdb, _ := ethdb.NewMemDatabase()
1221+
diskdb := ethdb.NewMemDatabase()
12221222
new(Genesis).MustCommit(diskdb)
12231223

12241224
chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{})
@@ -1247,7 +1247,7 @@ func TestTrieForkGC(t *testing.T) {
12471247
// Generate a canonical chain to act as the main dataset
12481248
engine := ethash.NewFaker()
12491249

1250-
db, _ := ethdb.NewMemDatabase()
1250+
db := ethdb.NewMemDatabase()
12511251
genesis := new(Genesis).MustCommit(db)
12521252
blocks, _ := GenerateChain(params.TestChainConfig, genesis, engine, db, 2*triesInMemory, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) })
12531253

@@ -1262,7 +1262,7 @@ func TestTrieForkGC(t *testing.T) {
12621262
forks[i] = fork[0]
12631263
}
12641264
// Import the canonical and fork chain side by side, forcing the trie cache to cache both
1265-
diskdb, _ := ethdb.NewMemDatabase()
1265+
diskdb := ethdb.NewMemDatabase()
12661266
new(Genesis).MustCommit(diskdb)
12671267

12681268
chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{})
@@ -1293,15 +1293,15 @@ func TestLargeReorgTrieGC(t *testing.T) {
12931293
// Generate the original common chain segment and the two competing forks
12941294
engine := ethash.NewFaker()
12951295

1296-
db, _ := ethdb.NewMemDatabase()
1296+
db := ethdb.NewMemDatabase()
12971297
genesis := new(Genesis).MustCommit(db)
12981298

12991299
shared, _ := GenerateChain(params.TestChainConfig, genesis, engine, db, 64, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{1}) })
13001300
original, _ := GenerateChain(params.TestChainConfig, shared[len(shared)-1], engine, db, 2*triesInMemory, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{2}) })
13011301
competitor, _ := GenerateChain(params.TestChainConfig, shared[len(shared)-1], engine, db, 2*triesInMemory+1, func(i int, b *BlockGen) { b.SetCoinbase(common.Address{3}) })
13021302

13031303
// Import the shared chain and the original canonical one
1304-
diskdb, _ := ethdb.NewMemDatabase()
1304+
diskdb := ethdb.NewMemDatabase()
13051305
new(Genesis).MustCommit(diskdb)
13061306

13071307
chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{})
@@ -1361,7 +1361,7 @@ func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks in
13611361
)
13621362
// Generate the original common chain segment and the two competing forks
13631363
engine := ethash.NewFaker()
1364-
db, _ := ethdb.NewMemDatabase()
1364+
db := ethdb.NewMemDatabase()
13651365
genesis := gspec.MustCommit(db)
13661366

13671367
blockGenerator := func(i int, block *BlockGen) {
@@ -1383,7 +1383,7 @@ func benchmarkLargeNumberOfValueToNonexisting(b *testing.B, numTxs, numBlocks in
13831383
b.ResetTimer()
13841384
for i := 0; i < b.N; i++ {
13851385
// Import the shared chain and the original canonical one
1386-
diskdb, _ := ethdb.NewMemDatabase()
1386+
diskdb := ethdb.NewMemDatabase()
13871387
gspec.MustCommit(diskdb)
13881388

13891389
chain, err := NewBlockChain(diskdb, nil, params.TestChainConfig, engine, vm.Config{})

‎core/chain_indexer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestChainIndexerWithChildren(t *testing.T) {
4848
// multiple backends. The section size and required confirmation count parameters
4949
// are randomized.
5050
func testChainIndexer(t *testing.T, count int) {
51-
db, _ := ethdb.NewMemDatabase()
51+
db := ethdb.NewMemDatabase()
5252
defer db.Close()
5353

5454
// Create a chain of indexers and ensure they all report empty

‎core/chain_makers.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,12 @@ func makeHeader(chain consensus.ChainReader, parent *types.Block, state *state.S
256256
// chain. Depending on the full flag, if creates either a full block chain or a
257257
// header only chain.
258258
func newCanonical(engine consensus.Engine, n int, full bool) (ethdb.Database, *BlockChain, error) {
259-
// Initialize a fresh chain with only a genesis block
260-
gspec := new(Genesis)
261-
db, _ := ethdb.NewMemDatabase()
262-
genesis := gspec.MustCommit(db)
259+
var (
260+
db = ethdb.NewMemDatabase()
261+
genesis = new(Genesis).MustCommit(db)
262+
)
263263

264+
// Initialize a fresh chain with only a genesis block
264265
blockchain, _ := NewBlockChain(db, nil, params.AllEthashProtocolChanges, engine, vm.Config{})
265266
// Create and inject the requested chain
266267
if n == 0 {

‎core/chain_makers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func ExampleGenerateChain() {
3636
addr1 = crypto.PubkeyToAddress(key1.PublicKey)
3737
addr2 = crypto.PubkeyToAddress(key2.PublicKey)
3838
addr3 = crypto.PubkeyToAddress(key3.PublicKey)
39-
db, _ = ethdb.NewMemDatabase()
39+
db = ethdb.NewMemDatabase()
4040
)
4141

4242
// Ensure that key1 has some funds in the genesis block.

‎core/dao_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ func TestDAOForkRangeExtradata(t *testing.T) {
3232
forkBlock := big.NewInt(32)
3333

3434
// Generate a common prefix for both pro-forkers and non-forkers
35-
db, _ := ethdb.NewMemDatabase()
35+
db := ethdb.NewMemDatabase()
3636
gspec := new(Genesis)
3737
genesis := gspec.MustCommit(db)
3838
prefix, _ := GenerateChain(params.TestChainConfig, genesis, ethash.NewFaker(), db, int(forkBlock.Int64()-1), func(i int, gen *BlockGen) {})
3939

4040
// Create the concurrent, conflicting two nodes
41-
proDb, _ := ethdb.NewMemDatabase()
41+
proDb := ethdb.NewMemDatabase()
4242
gspec.MustCommit(proDb)
4343

4444
proConf := *params.TestChainConfig
@@ -48,7 +48,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
4848
proBc, _ := NewBlockChain(proDb, nil, &proConf, ethash.NewFaker(), vm.Config{})
4949
defer proBc.Stop()
5050

51-
conDb, _ := ethdb.NewMemDatabase()
51+
conDb := ethdb.NewMemDatabase()
5252
gspec.MustCommit(conDb)
5353

5454
conConf := *params.TestChainConfig
@@ -67,7 +67,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
6767
// Try to expand both pro-fork and non-fork chains iteratively with other camp's blocks
6868
for i := int64(0); i < params.DAOForkExtraRange.Int64(); i++ {
6969
// Create a pro-fork block, and try to feed into the no-fork chain
70-
db, _ = ethdb.NewMemDatabase()
70+
db = ethdb.NewMemDatabase()
7171
gspec.MustCommit(db)
7272
bc, _ := NewBlockChain(db, nil, &conConf, ethash.NewFaker(), vm.Config{})
7373
defer bc.Stop()
@@ -92,7 +92,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
9292
t.Fatalf("contra-fork chain didn't accepted no-fork block: %v", err)
9393
}
9494
// Create a no-fork block, and try to feed into the pro-fork chain
95-
db, _ = ethdb.NewMemDatabase()
95+
db = ethdb.NewMemDatabase()
9696
gspec.MustCommit(db)
9797
bc, _ = NewBlockChain(db, nil, &proConf, ethash.NewFaker(), vm.Config{})
9898
defer bc.Stop()
@@ -118,7 +118,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
118118
}
119119
}
120120
// Verify that contra-forkers accept pro-fork extra-datas after forking finishes
121-
db, _ = ethdb.NewMemDatabase()
121+
db = ethdb.NewMemDatabase()
122122
gspec.MustCommit(db)
123123
bc, _ := NewBlockChain(db, nil, &conConf, ethash.NewFaker(), vm.Config{})
124124
defer bc.Stop()
@@ -138,7 +138,7 @@ func TestDAOForkRangeExtradata(t *testing.T) {
138138
t.Fatalf("contra-fork chain didn't accept pro-fork block post-fork: %v", err)
139139
}
140140
// Verify that pro-forkers accept contra-fork extra-datas after forking finishes
141-
db, _ = ethdb.NewMemDatabase()
141+
db = ethdb.NewMemDatabase()
142142
gspec.MustCommit(db)
143143
bc, _ = NewBlockChain(db, nil, &proConf, ethash.NewFaker(), vm.Config{})
144144
defer bc.Stop()

0 commit comments

Comments
 (0)