diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-11-15 20:46:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 20:46:47 +0800 |
| commit | 81d9d7d38555a63602b9da3d07955ad4e5a62f02 (patch) | |
| tree | 9ce0d55bfe182f6493867ea5497bf2c8cd9e8523 /core/vm/runtime/runtime.go | |
| parent | ef9265d0d7abf6614c1d2fb977989ab0d400a590 (diff) | |
| parent | 822355f8a6e8826561433392fd94a8bde7e4dbf3 (diff) | |
| download | go-tangerine-1.4.19.tar go-tangerine-1.4.19.tar.gz go-tangerine-1.4.19.tar.bz2 go-tangerine-1.4.19.tar.lz go-tangerine-1.4.19.tar.xz go-tangerine-1.4.19.tar.zst go-tangerine-1.4.19.zip | |
Merge pull request #3252 from obscuren/release/1.4v1.4.19
1.4 HF
Diffstat (limited to 'core/vm/runtime/runtime.go')
| -rw-r--r-- | core/vm/runtime/runtime.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 343aee514..aa944ffdc 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -22,7 +22,6 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/params" @@ -39,7 +38,7 @@ func (ruleSet) GasTable(*big.Int) params.GasTable { // Config is a basic type specifying certain configuration flags for running // the EVM. type Config struct { - RuleSet vm.RuleSet + ChainConfig *params.ChainConfig Difficulty *big.Int Origin common.Address Coinbase common.Address @@ -57,8 +56,8 @@ type Config struct { // sets defaults on the config func setDefaults(cfg *Config) { - if cfg.RuleSet == nil { - cfg.RuleSet = ruleSet{} + if cfg.ChainConfig == nil { + cfg.ChainConfig = params.TestChainConfig } if cfg.Difficulty == nil { |