diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-04-12 22:01:51 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-04-12 22:01:51 +0800 |
| commit | 33e4f51749cdfcb9125159aae8481a8130e50062 (patch) | |
| tree | 3a9415c6320a7a1b81255f7232473abbbcf79307 | |
| parent | 8627680e24a29abd5f2aaaeaa2c1c852d8fb693b (diff) | |
| parent | aceaaa517834fa8dfc5121b66dfd633f0b10ca8f (diff) | |
| download | dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar.gz dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar.bz2 dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar.lz dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar.xz dexon-33e4f51749cdfcb9125159aae8481a8130e50062.tar.zst dexon-33e4f51749cdfcb9125159aae8481a8130e50062.zip | |
Merge pull request #2444 from karalabe/gethrpctest-chainconfig-panic
cmd/gethrpctest: add missing chain configuration config field
| -rw-r--r-- | cmd/gethrpctest/main.go | 3 | ||||
| -rw-r--r-- | eth/backend.go | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/cmd/gethrpctest/main.go b/cmd/gethrpctest/main.go index 38016fb35..4843f8658 100644 --- a/cmd/gethrpctest/main.go +++ b/cmd/gethrpctest/main.go @@ -26,11 +26,13 @@ import ( "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/node" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/tests" "github.com/ethereum/go-ethereum/whisper" ) @@ -129,6 +131,7 @@ func MakeSystemNode(keydir string, privkey string, test *tests.BlockTest) (*node ethConf := ð.Config{ TestGenesisState: db, TestGenesisBlock: test.Genesis, + ChainConfig: &core.ChainConfig{HomesteadBlock: params.MainNetHomesteadBlock}, AccountManager: accman, } if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { return eth.New(ctx, ethConf) }); err != nil { diff --git a/eth/backend.go b/eth/backend.go index f4282d59f..cab83588c 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -19,6 +19,7 @@ package eth import ( "bytes" + "errors" "fmt" "math/big" "os" @@ -243,6 +244,9 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) { glog.V(logger.Info).Infoln("WARNING: Wrote default ethereum genesis block") } + if config.ChainConfig == nil { + return nil, errors.New("missing chain config") + } eth.chainConfig = config.ChainConfig eth.chainConfig.VmConfig = vm.Config{ EnableJit: config.EnableJit, |