From de422c066b70e6f54994c123b56d1bb3bdcc2733 Mon Sep 17 00:00:00 2001
From: Nathan Wilcox <nathan@z.cash>
Date: Mon, 18 Sep 2017 15:29:10 +0900
Subject: [PATCH] [tests pass] Ensure `importprivkey` outputs the address in
 case key is already imported.

---
 src/wallet/rpcdump.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index 578c0e1fe..fe5b83e8d 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -128,8 +128,9 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
         pwalletMain->SetAddressBook(vchAddress, strLabel, "receive");
 
         // Don't throw error in case a key is already there
-        if (pwalletMain->HaveKey(vchAddress))
-            return NullUniValue;
+        if (pwalletMain->HaveKey(vchAddress)) {
+            return CBitcoinAddress(vchAddress).ToString();
+        }
 
         pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;