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 /core/vm | |
| parent | bb366271fe33cf87b462dc5a25ac6c448ac6d2e1 (diff) | |
| download | go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.gz go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.bz2 go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.lz go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.xz go-tangerine-9e5f03b6c487175cc5aa1224e5e12fd573f483a7.tar.zst go-tangerine-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 'core/vm')
| -rw-r--r-- | core/vm/runtime/runtime.go | 4 | ||||
| -rw-r--r-- | core/vm/runtime/runtime_test.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index aa386a995..44cde4f70 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -102,7 +102,7 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) { if cfg.State == nil { db, _ := ethdb.NewMemDatabase() - cfg.State, _ = state.New(common.Hash{}, db) + cfg.State, _ = state.New(common.Hash{}, state.NewDatabase(db)) } var ( address = common.StringToAddress("contract") @@ -133,7 +133,7 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, uint64, error) { if cfg.State == nil { db, _ := ethdb.NewMemDatabase() - cfg.State, _ = state.New(common.Hash{}, db) + cfg.State, _ = state.New(common.Hash{}, state.NewDatabase(db)) } var ( vmenv = NewEnv(cfg, cfg.State) diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index 7f40770d2..2c4dc5026 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -95,7 +95,7 @@ func TestExecute(t *testing.T) { func TestCall(t *testing.T) { db, _ := ethdb.NewMemDatabase() - state, _ := state.New(common.Hash{}, db) + state, _ := state.New(common.Hash{}, state.NewDatabase(db)) address := common.HexToAddress("0x0a") state.SetCode(address, []byte{ byte(vm.PUSH1), 10, |