From afce85eb994384246e455b766549c3206cb059e0 Mon Sep 17 00:00:00 2001
From: Jon Atack <jon@atack.com>
Date: Sun, 3 May 2020 11:10:24 +0200
Subject: [PATCH] cli: use GetWalletBalances() functionality for -getinfo

and replace GetBoolArg with IsArgSet as we only want
to know if the arg is passed; we do not need the value.
---
 src/bitcoin-cli.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 4d5b8f847be..045442c9ff3 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -532,9 +532,8 @@ static int CommandLineRPC(int argc, char *argv[])
         }
         std::unique_ptr<BaseRequestHandler> rh;
         std::string method;
-        if (gArgs.GetBoolArg("-getinfo", false)) {
+        if (gArgs.IsArgSet("-getinfo")) {
             rh.reset(new GetinfoRequestHandler());
-            method = "";
         } else {
             rh.reset(new DefaultRequestHandler());
             if (args.size() < 1) {
@@ -567,6 +566,9 @@ static int CommandLineRPC(int argc, char *argv[])
                 }
             }
         } else {
+            if (gArgs.IsArgSet("-getinfo") && !gArgs.IsArgSet("-rpcwallet")) {
+                GetWalletBalances(result); // fetch multiwallet balances and append to result
+            }
             // Result
             if (result.isNull()) {
                 strPrint = "";