aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/customflags.go5
-rw-r--r--cmd/utils/flags.go8
2 files changed, 5 insertions, 8 deletions
diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go
index 8e5944a50..52cd7b8c7 100644
--- a/cmd/utils/customflags.go
+++ b/cmd/utils/customflags.go
@@ -23,8 +23,6 @@ import (
"os/user"
"path"
"strings"
-
- "gopkg.in/urfave/cli.v1"
)
// Custom type which is registered in the flags library which cli uses for
@@ -46,7 +44,6 @@ func (self *DirectoryString) Set(value string) error {
// Custom cli.Flag type which expand the received string to an absolute path.
// e.g. ~/.ethereum -> /home/username/.ethereum
type DirectoryFlag struct {
- cli.GenericFlag
Name string
Value DirectoryString
Usage string
@@ -117,7 +114,7 @@ func withEnvHint(envVar, str string) string {
return str + envText
}
-func (self DirectoryFlag) getName() string {
+func (self DirectoryFlag) GetName() string {
return self.Name
}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 18745e557..5092616de 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -337,10 +337,10 @@ var (
Usage: "Network listening port",
Value: 30303,
}
- BootnodesFlag = cli.StringSliceFlag{
+ BootnodesFlag = cli.StringFlag{
Name: "bootnodes",
Usage: "Comma separated enode URLs for P2P discovery bootstrap",
- Value: nil,
+ Value: "",
}
NodeKeyFileFlag = cli.StringFlag{
Name: "nodekey",
@@ -487,7 +487,7 @@ func makeNodeUserIdent(ctx *cli.Context) string {
func MakeBootstrapNodes(ctx *cli.Context) []*discover.Node {
urls := params.MainnetBootnodes
if ctx.GlobalIsSet(BootnodesFlag.Name) {
- urls = ctx.GlobalStringSlice(BootnodesFlag.Name)
+ urls = strings.Split(ctx.GlobalString(BootnodesFlag.Name), ",")
} else if ctx.GlobalBool(TestNetFlag.Name) {
urls = params.TestnetBootnodes
}
@@ -509,7 +509,7 @@ func MakeBootstrapNodes(ctx *cli.Context) []*discover.Node {
func MakeBootstrapNodesV5(ctx *cli.Context) []*discv5.Node {
urls := params.DiscoveryV5Bootnodes
if ctx.GlobalIsSet(BootnodesFlag.Name) {
- urls = ctx.GlobalStringSlice(BootnodesFlag.Name)
+ urls = strings.Split(ctx.GlobalString(BootnodesFlag.Name), ",")
}
bootnodes := make([]*discv5.Node, 0, len(urls))