diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-12 22:24:34 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-12 22:24:34 +0800 |
| commit | b006b677683071c5e114d17649262ed414ba1779 (patch) | |
| tree | 1a27e437dd599bd1277b4ce4587bcd89ceeed4c7 /cmd/utils | |
| parent | 4418e4ea6a9b8d648bcb7e7241b887cbab6936bc (diff) | |
| parent | 2a0e5888fdd357553e31bcee4264d9db6f486f39 (diff) | |
| download | dexon-b006b677683071c5e114d17649262ed414ba1779.tar dexon-b006b677683071c5e114d17649262ed414ba1779.tar.gz dexon-b006b677683071c5e114d17649262ed414ba1779.tar.bz2 dexon-b006b677683071c5e114d17649262ed414ba1779.tar.lz dexon-b006b677683071c5e114d17649262ed414ba1779.tar.xz dexon-b006b677683071c5e114d17649262ed414ba1779.tar.zst dexon-b006b677683071c5e114d17649262ed414ba1779.zip | |
Merge branch 'develop' into rpcfrontier
Diffstat (limited to 'cmd/utils')
| -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), |