Use CBitcoinAddress wrappers in Zcash-specific code

2018-04-20 15:09:23 +01:00
parent 07444da1db
commit b6be3e88bb
12 changed files with 78 additions and 80 deletions
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -129,7 +129,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)

        // Don't throw error in case a key is already there
        if (pwalletMain->HaveKey(vchAddress)) {
-            return CBitcoinAddress(vchAddress).ToString();
+            return EncodeDestination(vchAddress);
        }

        pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
@@ -145,7 +145,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
        }
    }

-    return CBitcoinAddress(vchAddress).ToString();
+    return EncodeDestination(vchAddress);
 }

 UniValue importaddress(const UniValue& params, bool fHelp)