wallet: Pass ArgsManager into ExecuteWalletToolFunc instead of using global

MarcoFalke · MarcoFalke · commit fa7dde1c418e · 2020-12-17T19:16:00.000+01:00
diff --git a/src/bitcoin-wallet.cpp b/src/bitcoin-wallet.cpp
@@ -120,8 +120,9 @@ int main(int argc, char* argv[])
 
     ECCVerifyHandle globalVerifyHandle;
     ECC_Start();
-    if (!WalletTool::ExecuteWalletToolFunc(method, name))
+    if (!WalletTool::ExecuteWalletToolFunc(gArgs, method, name)) {
         return EXIT_FAILURE;
+    }
     ECC_Stop();
     return EXIT_SUCCESS;
 }
diff --git a/src/wallet/wallettool.cpp b/src/wallet/wallettool.cpp
@@ -103,25 +103,25 @@ static void WalletShowInfo(CWallet* wallet_instance)
     tfm::format(std::cout, "Address Book: %zu\n", wallet_instance->m_address_book.size());
 }
 
-bool ExecuteWalletToolFunc(const std::string& command, const std::string& name)
+bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command, const std::string& name)
 {
     fs::path path = fs::absolute(name, GetWalletDir());
 
     // -format is only allowed with createfromdump. Disallow it for all other commands.
-    if (gArgs.IsArgSet("-format") && command != "createfromdump") {
+    if (args.IsArgSet("-format") && command != "createfromdump") {
         tfm::format(std::cerr, "The -format option can only be used with the \"createfromdump\" command.\n");
         return false;
     }
     // -dumpfile is only allowed with dump and createfromdump. Disallow it for all other commands.
-    if (gArgs.IsArgSet("-dumpfile") && command != "dump" && command != "createfromdump") {
+    if (args.IsArgSet("-dumpfile") && command != "dump" && command != "createfromdump") {
         tfm::format(std::cerr, "The -dumpfile option can only be used with the \"dump\" and \"createfromdump\" commands.\n");
         return false;
     }
 
     if (command == "create") {
         DatabaseOptions options;
         options.require_create = true;
-        if (gArgs.GetBoolArg("-descriptors", false)) {
+        if (args.GetBoolArg("-descriptors", false)) {
             options.create_flags |= WALLET_FLAG_DESCRIPTORS;
             options.require_format = DatabaseFormat::SQLITE;
         }
diff --git a/src/wallet/wallettool.h b/src/wallet/wallettool.h
@@ -10,7 +10,7 @@
 namespace WalletTool {
 
 void WalletShowInfo(CWallet* wallet_instance);
-bool ExecuteWalletToolFunc(const std::string& command, const std::string& file);
+bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command, const std::string& file);
 
 } // namespace WalletTool
 

Original file line number	Diff line number	Diff line change
`@@ -103,25 +103,25 @@ static void WalletShowInfo(CWallet* wallet_instance)`
`103`	`103`	`tfm::format(std::cout, "Address Book: %zu\n", wallet_instance->m_address_book.size());`
`104`	`104`	`}`
`105`	`105`
`106`		`-bool ExecuteWalletToolFunc(const std::string& command, const std::string& name)`
	`106`	`+bool ExecuteWalletToolFunc(const ArgsManager& args, const std::string& command, const std::string& name)`
`107`	`107`	`{`
`108`	`108`	`fs::path path = fs::absolute(name, GetWalletDir());`
`109`	`109`
`110`	`110`	`// -format is only allowed with createfromdump. Disallow it for all other commands.`
`111`		`- if (gArgs.IsArgSet("-format") && command != "createfromdump") {`
	`111`	`+ if (args.IsArgSet("-format") && command != "createfromdump") {`
`112`	`112`	`tfm::format(std::cerr, "The -format option can only be used with the \"createfromdump\" command.\n");`
`113`	`113`	`return false;`
`114`	`114`	`}`
`115`	`115`	`// -dumpfile is only allowed with dump and createfromdump. Disallow it for all other commands.`
`116`		`- if (gArgs.IsArgSet("-dumpfile") && command != "dump" && command != "createfromdump") {`
	`116`	`+ if (args.IsArgSet("-dumpfile") && command != "dump" && command != "createfromdump") {`
`117`	`117`	`tfm::format(std::cerr, "The -dumpfile option can only be used with the \"dump\" and \"createfromdump\" commands.\n");`
`118`	`118`	`return false;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if (command == "create") {`
`122`	`122`	`DatabaseOptions options;`
`123`	`123`	`options.require_create = true;`
`124`		`- if (gArgs.GetBoolArg("-descriptors", false)) {`
	`124`	`+ if (args.GetBoolArg("-descriptors", false)) {`
`125`	`125`	`options.create_flags \|= WALLET_FLAG_DESCRIPTORS;`
`126`	`126`	`options.require_format = DatabaseFormat::SQLITE;`
`127`	`127`	`}`