[dep] Migrate urfave/cli v1 => v2 (#37)

https://github.com/urfave/cli/blob/main/docs/migrate-v1-to-v2.md

app/action_license.go

@@ -3,11 +3,11 @@ package app
 import (
 	"fmt"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 var (
-	licenseCommand = cli.Command{
+	licenseCommand = &cli.Command{
 		Action:    licenseAction,
 		Name:      "license",
 		Usage:     "Display license information",

app/action_version.go

@@ -5,13 +5,13 @@ import (
 	"os"
 	"runtime"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 
 	"github.com/zenon-network/go-zenon/metadata"
 )
 
 var (
-	versionCommand = cli.Command{
+	versionCommand = &cli.Command{
 		Action:    versionAction,
 		Name:      "version",
 		Usage:     "Print version numbers",

app/cli.go

@@ -10,7 +10,7 @@ import (
 	"sort"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 
 	"github.com/zenon-network/go-zenon/common"
 	"github.com/zenon-network/go-zenon/metadata"
@@ -41,7 +41,7 @@ func init() {
 	app.HideVersion = false
 	app.Version = metadata.Version
 	app.Compiled = time.Now()
-	app.Authors = []cli.Author{
+	app.Authors = []*cli.Author{
 		{
 			Name:  "The Zenon Developers",
 			Email: "portal@zenon.network",
@@ -51,7 +51,7 @@ func init() {
 	app.Usage = "znnd Node"
 
 	//Import: Please add the New command here
-	app.Commands = []cli.Command{
+	app.Commands = []*cli.Command{
 		versionCommand,
 		licenseCommand,
 	}
@@ -74,7 +74,7 @@ func beforeAction(ctx *cli.Context) error {
 	runtime.GOMAXPROCS(max)
 
 	// pprof server
-	if ctx.GlobalIsSet(PprofFlag.Name) {
+	if ctx.IsSet(PprofFlag.Name) {
 		listenHost := ctx.String(PprofAddrFlag.Name)
 
 		port := ctx.Int(PprofPortFlag.Name)
@@ -94,8 +94,8 @@ func beforeAction(ctx *cli.Context) error {
 
 func action(ctx *cli.Context) error {
 	//Make sure No subCommands were entered,Only the flags
-	if args := ctx.Args(); len(args) > 0 {
-		return fmt.Errorf("invalid command: %q", args[0])
+	if args := ctx.Args(); args.Len() > 0 {
+		return fmt.Errorf("invalid command: %q", args.Get(0))
 	}
 	var err error
 	nodeManager, err = NewNodeManager(ctx)

app/config.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 
 	"github.com/zenon-network/go-zenon/common"
 	"github.com/zenon-network/go-zenon/node"
@@ -44,73 +44,73 @@ func MakeConfig(ctx *cli.Context) (*node.Config, error) {
 }
 
 func applyFlagsToConfig(ctx *cli.Context, cfg *node.Config) {
-	if dataDir := ctx.GlobalString(DataPathFlag.Name); ctx.GlobalIsSet(DataPathFlag.Name) && len(dataDir) > 0 {
+	if dataDir := ctx.String(DataPathFlag.Name); ctx.IsSet(DataPathFlag.Name) && len(dataDir) > 0 {
 		cfg.DataPath = dataDir
 	}
 
 	// Wallet
-	if walletDir := ctx.GlobalString(WalletDirFlag.Name); ctx.GlobalIsSet(WalletDirFlag.Name) && len(walletDir) > 0 {
+	if walletDir := ctx.String(WalletDirFlag.Name); ctx.IsSet(WalletDirFlag.Name) && len(walletDir) > 0 {
 		cfg.WalletPath = walletDir
 	}
 
-	if genesisFile := ctx.GlobalString(GenesisFileFlag.Name); ctx.GlobalIsSet(GenesisFileFlag.Name) && len(genesisFile) > 0 {
+	if genesisFile := ctx.String(GenesisFileFlag.Name); ctx.IsSet(GenesisFileFlag.Name) && len(genesisFile) > 0 {
 		cfg.GenesisFile = genesisFile
 	}
 
 	// Network Config
-	if identity := ctx.GlobalString(IdentityFlag.Name); ctx.GlobalIsSet(IdentityFlag.Name) && len(identity) > 0 {
+	if identity := ctx.String(IdentityFlag.Name); ctx.IsSet(IdentityFlag.Name) && len(identity) > 0 {
 		cfg.Name = identity
 	}
 
-	if ctx.GlobalIsSet(MaxPeersFlag.Name) {
-		cfg.Net.MaxPeers = ctx.GlobalInt(MaxPeersFlag.Name)
+	if ctx.IsSet(MaxPeersFlag.Name) {
+		cfg.Net.MaxPeers = ctx.Int(MaxPeersFlag.Name)
 	}
 
-	if ctx.GlobalIsSet(MaxPendingPeersFlag.Name) {
-		cfg.Net.MaxPendingPeers = ctx.GlobalInt(MaxPendingPeersFlag.Name)
+	if ctx.IsSet(MaxPendingPeersFlag.Name) {
+		cfg.Net.MaxPendingPeers = ctx.Int(MaxPendingPeersFlag.Name)
 	}
 
-	if listenHost := ctx.GlobalString(ListenHostFlag.Name); ctx.GlobalIsSet(ListenHostFlag.Name) && len(listenHost) > 0 {
+	if listenHost := ctx.String(ListenHostFlag.Name); ctx.IsSet(ListenHostFlag.Name) && len(listenHost) > 0 {
 		cfg.RPC.HTTPHost = listenHost
 	}
 
-	if ctx.GlobalIsSet(ListenPortFlag.Name) {
-		cfg.Net.ListenPort = ctx.GlobalInt(ListenPortFlag.Name)
+	if ctx.IsSet(ListenPortFlag.Name) {
+		cfg.Net.ListenPort = ctx.Int(ListenPortFlag.Name)
 	}
 
 	// Http Config
-	if ctx.GlobalIsSet(RPCEnabledFlag.Name) {
-		cfg.RPC.EnableHTTP = ctx.GlobalBool(RPCEnabledFlag.Name)
+	if ctx.IsSet(RPCEnabledFlag.Name) {
+		cfg.RPC.EnableHTTP = ctx.Bool(RPCEnabledFlag.Name)
 	}
 
-	if httpHost := ctx.GlobalString(RPCListenAddrFlag.Name); ctx.GlobalIsSet(RPCListenAddrFlag.Name) && len(httpHost) > 0 {
+	if httpHost := ctx.String(RPCListenAddrFlag.Name); ctx.IsSet(RPCListenAddrFlag.Name) && len(httpHost) > 0 {
 		cfg.RPC.HTTPHost = httpHost
 	}
 
-	if ctx.GlobalIsSet(RPCPortFlag.Name) {
-		cfg.RPC.HTTPPort = ctx.GlobalInt(RPCPortFlag.Name)
+	if ctx.IsSet(RPCPortFlag.Name) {
+		cfg.RPC.HTTPPort = ctx.Int(RPCPortFlag.Name)
 	}
 
 	// WS Config
-	if ctx.GlobalIsSet(WSEnabledFlag.Name) {
-		cfg.RPC.EnableWS = ctx.GlobalBool(WSEnabledFlag.Name)
+	if ctx.IsSet(WSEnabledFlag.Name) {
+		cfg.RPC.EnableWS = ctx.Bool(WSEnabledFlag.Name)
 	}
 
-	if wsListenAddr := ctx.GlobalString(WSListenAddrFlag.Name); ctx.GlobalIsSet(WSListenAddrFlag.Name) && len(wsListenAddr) > 0 {
+	if wsListenAddr := ctx.String(WSListenAddrFlag.Name); ctx.IsSet(WSListenAddrFlag.Name) && len(wsListenAddr) > 0 {
 		cfg.RPC.WSHost = wsListenAddr
 	}
 
-	if ctx.GlobalIsSet(WSPortFlag.Name) {
-		cfg.RPC.WSPort = ctx.GlobalInt(WSPortFlag.Name)
+	if ctx.IsSet(WSPortFlag.Name) {
+		cfg.RPC.WSPort = ctx.Int(WSPortFlag.Name)
 	}
 
 	// Log Level Config
-	if logLevel := ctx.GlobalString(LogLvlFlag.Name); ctx.GlobalIsSet(LogLvlFlag.Name) && len(logLevel) > 0 {
+	if logLevel := ctx.String(LogLvlFlag.Name); ctx.IsSet(LogLvlFlag.Name) && len(logLevel) > 0 {
 		cfg.LogLevel = logLevel
 	}
 }
 func readConfigFromFile(ctx *cli.Context, cfg *node.Config) error {
-	if file := ctx.GlobalString(ConfigFileFlag.Name); file != "" {
+	if file := ctx.String(ConfigFileFlag.Name); file != "" {
 		if jsonConf, err := os.ReadFile(file); err == nil {
 			err = json.Unmarshal(jsonConf, &cfg)
 			if err == nil {
@@ -124,7 +124,7 @@ func readConfigFromFile(ctx *cli.Context, cfg *node.Config) error {
 
 	// second read default settings
 	dataPath := cfg.DataPath
-	if dataDir := ctx.GlobalString(DataPathFlag.Name); len(dataDir) > 0 {
+	if dataDir := ctx.String(DataPathFlag.Name); len(dataDir) > 0 {
 		dataPath = dataDir
 	}
 

app/flags.go

@@ -4,114 +4,114 @@ import (
 	"github.com/zenon-network/go-zenon/node"
 	"github.com/zenon-network/go-zenon/p2p"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 var (
 
 	// pprof
 
-	PprofFlag = cli.BoolFlag{
+	PprofFlag = &cli.BoolFlag{
 		Name:  "pprof",
 		Usage: "Enable the pprof HTTP server",
 	}
-	PprofPortFlag = cli.Uint64Flag{
+	PprofPortFlag = &cli.Uint64Flag{
 		Name:  "pprof.port",
 		Usage: "pprof HTTP server listening port",
 		Value: 6060,
 	}
 
-	PprofAddrFlag = cli.StringFlag{
+	PprofAddrFlag = &cli.StringFlag{
 		Name:  "pprof.addr",
 		Usage: "pprof HTTP server listening interface",
 		Value: "127.0.0.1",
 	}
 
 	// config
 
-	ConfigFileFlag = cli.StringFlag{
+	ConfigFileFlag = &cli.StringFlag{
 		Name:  "config",
 		Usage: "Node configuration file in JSON format",
 		Value: "DataPath/config.json",
 	}
 
 	// general
 
-	DataPathFlag = cli.StringFlag{
+	DataPathFlag = &cli.StringFlag{
 		Name:  "data",
 		Usage: "Path to the main zenon data folder. Used for store all files.",
 		Value: node.DefaultDataDir(),
 	}
-	WalletDirFlag = cli.StringFlag{
+	WalletDirFlag = &cli.StringFlag{
 		Name:  "wallet",
 		Usage: "Directory for the wallet.",
 		Value: "DataPath/wallet",
 	}
-	GenesisFileFlag = cli.StringFlag{
+	GenesisFileFlag = &cli.StringFlag{
 		Name:  "genesis",
 		Usage: "Path to genesis file. Used to override embedded genesis from the binary source-code.",
 		Value: "DataPath/genesis.json",
 	}
-	IdentityFlag = cli.StringFlag{
+	IdentityFlag = &cli.StringFlag{
 		Name:  "name", //mapping:p2p.Name
 		Usage: "Node's name. Visible in the network.",
 	}
 
 	// network
 
-	ListenHostFlag = cli.StringFlag{
+	ListenHostFlag = &cli.StringFlag{
 		Name:  "host",
 		Usage: "Network listening host",
 		Value: p2p.DefaultListenHost,
 	}
-	ListenPortFlag = cli.IntFlag{
+	ListenPortFlag = &cli.IntFlag{
 		Name:  "port",
 		Usage: "Network listening port",
 		Value: p2p.DefaultListenPort,
 	}
-	MaxPeersFlag = cli.UintFlag{
+	MaxPeersFlag = &cli.UintFlag{
 		Name:  "max-peers",
 		Usage: "Maximum number of network peers (network disabled if set to 0)",
 		Value: p2p.DefaultMaxPeers,
 	}
-	MaxPendingPeersFlag = cli.UintFlag{
+	MaxPendingPeersFlag = &cli.UintFlag{
 		Name:  "max-pending-peers",
 		Usage: "Maximum number of db connection attempts (defaults used if set to 0)",
 		Value: p2p.DefaultMaxPeers,
 	}
 
 	// rpc
 
-	RPCEnabledFlag = cli.BoolFlag{
+	RPCEnabledFlag = &cli.BoolFlag{
 		Name:  "http",
 		Usage: "Enable the HTTP-RPC server",
 	}
-	RPCListenAddrFlag = cli.StringFlag{
+	RPCListenAddrFlag = &cli.StringFlag{
 		Name:  "http-addr",
 		Usage: "HTTP-RPC server listening interface",
 	}
-	RPCPortFlag = cli.IntFlag{
+	RPCPortFlag = &cli.IntFlag{
 		Name:  "http-port",
 		Usage: "HTTP-RPC server listening port",
 		Value: p2p.DefaultHTTPPort,
 	}
-	WSEnabledFlag = cli.BoolFlag{
+	WSEnabledFlag = &cli.BoolFlag{
 		Name:  "ws",
 		Usage: "Enable the WS-RPC server",
 	}
-	WSListenAddrFlag = cli.StringFlag{
+	WSListenAddrFlag = &cli.StringFlag{
 		Name:  "ws-addr",
 		Usage: "WS-RPC server listening interface",
 	}
-	WSPortFlag = cli.IntFlag{
+	WSPortFlag = &cli.IntFlag{
 		Name:  "ws-port",
 		Usage: "WS-RPC server listening port",
 		Value: p2p.DefaultWSPort,
 	}
 
 	// log
 
-	LogLvlFlag = cli.StringFlag{
+	LogLvlFlag = &cli.StringFlag{
 		Name:  "loglevel",
 		Usage: "log level (info,error,warn,debug)",
 	}

app/manager.go

@@ -8,7 +8,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 
 	"github.com/zenon-network/go-zenon/node"
 )

app/manager_libznn.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 
 	"github.com/zenon-network/go-zenon/node"
 )

app/templates.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 func init() {

go.mod

@@ -20,16 +20,17 @@ require (
 	github.com/stretchr/testify v1.7.2
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/tyler-smith/go-bip39 v1.1.0
+	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/crypto v0.1.0
 	gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
-	gopkg.in/urfave/cli.v1 v1.20.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
 	github.com/go-kit/kit v0.9.0 // indirect
@@ -40,8 +41,10 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/onsi/gomega v1.10.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 	golang.org/x/sys v0.1.0 // indirect