diff options
| author | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-10-06 22:35:55 +0800 |
|---|---|---|
| committer | Gustav Simonsson <gustav.simonsson@gmail.com> | 2015-10-16 08:22:06 +0800 |
| commit | 1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8 (patch) | |
| tree | fefd9cfe28ce5b409d58c70b03cf4a6d6dc84873 /cmd/geth | |
| parent | f466243417f60531998e8b500f2bb043af5b3d2a (diff) | |
| download | go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar.gz go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar.bz2 go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar.lz go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar.xz go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.tar.zst go-tangerine-1b1f293082044c43d8d1c5df9ac40aab8fdb2ae8.zip | |
core/state, core, miner: handle missing root error from state.New
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/blocktestcmd.go | 10 | ||||
| -rw-r--r-- | cmd/geth/chaincmd.go | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go index e0a5becdc..e4d97aa53 100644 --- a/cmd/geth/blocktestcmd.go +++ b/cmd/geth/blocktestcmd.go @@ -101,7 +101,8 @@ func runBlockTest(ctx *cli.Context) { func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, error) { cfg := utils.MakeEthConfig(ClientIdentifier, Version, ctx) - cfg.NewDB = func(path string) (ethdb.Database, error) { return ethdb.NewMemDatabase() } + db, _ := ethdb.NewMemDatabase() + cfg.NewDB = func(path string) (ethdb.Database, error) { return db, nil } cfg.MaxPeers = 0 // disable network cfg.Shh = false // disable whisper cfg.NAT = nil // disable port mapping @@ -113,7 +114,7 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er // import the genesis block ethereum.ResetWithGenesisBlock(test.Genesis) // import pre accounts - _, err = test.InsertPreState(ethereum) + _, err = test.InsertPreState(db, cfg.AccountManager) if err != nil { return ethereum, fmt.Errorf("InsertPreState: %v", err) } @@ -123,7 +124,10 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er if err != nil { return ethereum, fmt.Errorf("Block Test load error: %v", err) } - newDB := cm.State() + newDB, err := cm.State() + if err != nil { + return ethereum, fmt.Errorf("Block Test get state error: %v", err) + } if err := test.ValidatePostState(newDB); err != nil { return ethereum, fmt.Errorf("post state validation failed: %v", err) } diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index c5bc4b66a..80f3777d6 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -179,7 +179,11 @@ func dump(ctx *cli.Context) { fmt.Println("{}") utils.Fatalf("block not found") } else { - state := state.New(block.Root(), chainDb) + state, err := state.New(block.Root(), chainDb) + if err != nil { + utils.Fatalf("could not create new state: %v", err) + return + } fmt.Printf("%s\n", state.Dump()) } } |