aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-12 21:45:31 +0800
committerFelix Lange <fjl@twurst.com>2015-03-12 21:45:31 +0800
commit2a0e5888fdd357553e31bcee4264d9db6f486f39 (patch)
treea1d8e5463876380174f918674a03a88e8658bc0a /cmd
parent31a95151c9fb95c8527e419347556f455aebd1cb (diff)
parent485e37e889d5dd2c0461d686b122e1beb6089c16 (diff)
downloaddexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar.gz
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar.bz2
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar.lz
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar.xz
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.tar.zst
dexon-2a0e5888fdd357553e31bcee4264d9db6f486f39.zip
Merge pull request #460 from tgerring/ethutil
Move MakeName to ethutil
Diffstat (limited to 'cmd')
-rw-r--r--cmd/utils/flags.go3
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(&eth.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),