diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2017-06-27 21:57:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 21:57:06 +0800 |
| commit | 9e5f03b6c487175cc5aa1224e5e12fd573f483a7 (patch) | |
| tree | 475e573ff6c7e77cd069a2f6238afdb27d4bce43 /cmd/evm | |
| parent | bb366271fe33cf87b462dc5a25ac6c448ac6d2e1 (diff) | |
| download | dexon-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.gz dexon-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.zst dexon-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.zip | |
core/state: access trie through Database interface, track errors (#14589)
With this commit, core/state's access to the underlying key/value database is
mediated through an interface. Database errors are tracked in StateDB and
returned by CommitTo or the new Error method.
Motivation for this change: We can remove the light client's duplicated copy of
core/state. The light client now supports node iteration, so tracing and storage
enumeration can work with the light client (not implemented in this commit).
Diffstat (limited to 'cmd/evm')
| -rw-r--r-- | cmd/evm/runner.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 2ce0920f6..3f95a0c93 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -98,8 +98,8 @@ func runCmd(ctx *cli.Context) error { _, statedb = gen.ToBlock() chainConfig = gen.Config } else { - var db, _ = ethdb.NewMemDatabase() - statedb, _ = state.New(common.Hash{}, db) + db, _ := ethdb.NewMemDatabase() + statedb, _ = state.New(common.Hash{}, state.NewDatabase(db)) } if ctx.GlobalString(SenderFlag.Name) != "" { sender = common.HexToAddress(ctx.GlobalString(SenderFlag.Name)) @@ -188,7 +188,7 @@ func runCmd(ctx *cli.Context) error { execTime := time.Since(tstart) if ctx.GlobalBool(DumpFlag.Name) { - statedb.Commit(true) + statedb.IntermediateRoot(true) fmt.Println(string(statedb.Dump())) } |