diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-12 21:50:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-12 21:50:48 +0800 |
| commit | 3b3843e158d9ddbe76dcfa1e78977f0bd99a9142 (patch) | |
| tree | 420e7d43f232cd4ae7199ecb4931b9e3d85cf77a /cmd | |
| parent | ef6706696c39c77b20dc5127da8c62e89de39cf7 (diff) | |
| parent | 2a0e5888fdd357553e31bcee4264d9db6f486f39 (diff) | |
| download | go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar.gz go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar.bz2 go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar.lz go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar.xz go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.tar.zst go-tangerine-3b3843e158d9ddbe76dcfa1e78977f0bd99a9142.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/utils/flags.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 5c188a41e..990fb08e0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -18,7 +18,6 @@ import ( "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" - "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/xeth" @@ -194,7 +193,7 @@ func GetNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) { func GetEthereum(clientID, version string, ctx *cli.Context) (*eth.Ethereum, error) { return eth.New(ð.Config{ - Name: p2p.MakeName(clientID, version), + Name: ethutil.MakeName(clientID, version), DataDir: ctx.GlobalString(DataDirFlag.Name), LogFile: ctx.GlobalString(LogFileFlag.Name), LogLevel: ctx.GlobalInt(LogLevelFlag.Name), |