diff options
author | obscuren <geffobscura@gmail.com> | 2015-03-15 06:37:37 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2015-03-15 06:37:37 +0800 |
commit | 282d8c20fd184d062caf5c5af38987c59d1d64ba (patch) | |
tree | b5a196dd1ef20050160eb384c876ccaba1c4eebf /cmd/utils | |
parent | 12cee1377f8795608bae3cad38ee22c032b3b865 (diff) | |
parent | d9966d615813130c8d31b3b10a59d43d00fd9943 (diff) | |
download | dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar.gz dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar.bz2 dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar.lz dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar.xz dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.tar.zst dexon-282d8c20fd184d062caf5c5af38987c59d1d64ba.zip |
Merge branch 'fjl-block-tests' into develop
Diffstat (limited to 'cmd/utils')
-rw-r--r-- | cmd/utils/flags.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 990fb08e0..6bcd7e811 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -191,8 +191,8 @@ func GetNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) { return key } -func GetEthereum(clientID, version string, ctx *cli.Context) (*eth.Ethereum, error) { - return eth.New(ð.Config{ +func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { + return ð.Config{ Name: ethutil.MakeName(clientID, version), DataDir: ctx.GlobalString(DataDirFlag.Name), LogFile: ctx.GlobalString(LogFileFlag.Name), @@ -208,7 +208,7 @@ func GetEthereum(clientID, version string, ctx *cli.Context) (*eth.Ethereum, err Shh: true, Dial: true, BootNodes: ctx.GlobalString(BootnodesFlag.Name), - }) + } } func GetChain(ctx *cli.Context) (*core.ChainManager, ethutil.Database, ethutil.Database) { |