From fb4a2cc4e47f7832b3a88b106c645fca0414a99f Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Thu, 12 Aug 2021 09:07:07 -0400 Subject: [PATCH 1/5] cmd: add --nousb to the list of deprecated flags --- cmd/utils/flags_legacy.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index df597e3657d6c..627f774753193 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -36,10 +36,15 @@ var ShowDeprecated = cli.Command{ var DeprecatedFlags = []cli.Flag{ LegacyMinerGasTargetFlag, + NoUSBFlag, } var ( // (Deprecated May 2020, shown in aliased flags section) + NoUSBFlag = cli.BoolFlag{ + Name: "nousb", + Usage: "Disables monitoring for and managing USB hardware wallets (deprecated)", + } LegacyRPCEnabledFlag = cli.BoolFlag{ Name: "rpc", Usage: "Enable the HTTP-RPC server (deprecated and will be removed June 2021, use --http)", From 29ecb8ba13fa6792c86a04492fab691843022ec7 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Thu, 12 Aug 2021 09:23:04 -0400 Subject: [PATCH 2/5] cmd/utils: fix "redeclared" error --- cmd/utils/flags_legacy.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 627f774753193..156eece9f1485 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -41,10 +41,6 @@ var DeprecatedFlags = []cli.Flag{ var ( // (Deprecated May 2020, shown in aliased flags section) - NoUSBFlag = cli.BoolFlag{ - Name: "nousb", - Usage: "Disables monitoring for and managing USB hardware wallets (deprecated)", - } LegacyRPCEnabledFlag = cli.BoolFlag{ Name: "rpc", Usage: "Enable the HTTP-RPC server (deprecated and will be removed June 2021, use --http)", From b6f8777d84817d427020636d33a06eda5b17334a Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Thu, 12 Aug 2021 09:28:55 -0400 Subject: [PATCH 3/5] move nousb flag to legacy flags this build will fail because I briefly have to delete nousb entirely --- cmd/utils/flags.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 7fa3d8b86a987..f5d7fd2b11d11 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -124,11 +124,7 @@ var ( KeyStoreDirFlag = DirectoryFlag{ Name: "keystore", Usage: "Directory for the keystore (default = inside the datadir)", - } - NoUSBFlag = cli.BoolFlag{ - Name: "nousb", - Usage: "Disables monitoring for and managing USB hardware wallets (deprecated)", - } + } USBFlag = cli.BoolFlag{ Name: "usb", Usage: "Enable monitoring and management of USB hardware wallets", From b6d13100301a3bbd90d77030a9a293c54c3a9296 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Thu, 12 Aug 2021 09:30:09 -0400 Subject: [PATCH 4/5] cmd/utils: move --nousb to legacy flags file --- cmd/utils/flags_legacy.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 156eece9f1485..627f774753193 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -41,6 +41,10 @@ var DeprecatedFlags = []cli.Flag{ var ( // (Deprecated May 2020, shown in aliased flags section) + NoUSBFlag = cli.BoolFlag{ + Name: "nousb", + Usage: "Disables monitoring for and managing USB hardware wallets (deprecated)", + } LegacyRPCEnabledFlag = cli.BoolFlag{ Name: "rpc", Usage: "Enable the HTTP-RPC server (deprecated and will be removed June 2021, use --http)", From 35d8528297c07c0514e7e653f66a85c1a7659830 Mon Sep 17 00:00:00 2001 From: Zachinquarantine Date: Fri, 13 Aug 2021 09:48:34 -0400 Subject: [PATCH 5/5] clear blank space --- cmd/utils/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f5d7fd2b11d11..50a4a005fb866 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -124,7 +124,7 @@ var ( KeyStoreDirFlag = DirectoryFlag{ Name: "keystore", Usage: "Directory for the keystore (default = inside the datadir)", - } + } USBFlag = cli.BoolFlag{ Name: "usb", Usage: "Enable monitoring and management of USB hardware wallets",