diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2017-02-23 06:29:59 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2017-02-23 06:29:59 +0800 |
| commit | 024d41d0c2660d8f1dfbeb14921c7109e30493a2 (patch) | |
| tree | a2b4ed630b84084c7f439d1539ed0551ec729cbd /core/vm/runtime/runtime.go | |
| parent | 46ec4357e73dd0c43951d11638d9aed94f8ffd29 (diff) | |
| download | dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar.gz dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar.bz2 dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar.lz dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar.xz dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.tar.zst dexon-024d41d0c2660d8f1dfbeb14921c7109e30493a2.zip | |
core, core/state, core/vm: remove exported account getters (#3618)
Removed exported statedb object accessors, reducing the chance for nasty
bugs to creep in. It's also ugly and unnecessary to have these methods.
Diffstat (limited to 'core/vm/runtime/runtime.go')
| -rw-r--r-- | core/vm/runtime/runtime.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index cf46603db..94265626f 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -105,17 +105,17 @@ func Execute(code, input []byte, cfg *Config) ([]byte, *state.StateDB, error) { cfg.State, _ = state.New(common.Hash{}, db) } var ( - vmenv = NewEnv(cfg, cfg.State) - sender = cfg.State.CreateAccount(cfg.Origin) - receiver = cfg.State.CreateAccount(common.StringToAddress("contract")) + address = common.StringToAddress("contract") + vmenv = NewEnv(cfg, cfg.State) + sender = vm.AccountRef(cfg.Origin) ) + cfg.State.CreateAccount(address) // set the receiver's (the executing contract) code for execution. - receiver.SetCode(crypto.Keccak256Hash(code), code) - + cfg.State.SetCode(address, code) // Call the code with the given configuration. ret, _, err := vmenv.Call( sender, - receiver.Address(), + common.StringToAddress("contract"), input, cfg.GasLimit, cfg.Value, @@ -137,7 +137,7 @@ func Create(input []byte, cfg *Config) ([]byte, common.Address, error) { } var ( vmenv = NewEnv(cfg, cfg.State) - sender = cfg.State.CreateAccount(cfg.Origin) + sender = vm.AccountRef(cfg.Origin) ) // Call the code with the given configuration. |