Fix importmulti bug when importing an already imported key

Pedro Branco · MarcoFalke · commit 20cdc2b36c40 · 2017-10-17T21:44:23.000+02:00
Github-Pull: #11483 Rebased-From: a44a215
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -960,7 +960,7 @@ UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, const int6
                 pwallet->SetAddressBook(vchAddress, label, "receive");
 
                 if (pwallet->HaveKey(vchAddress)) {
-                    return false;
+                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                 }
 
                 pwallet->mapKeyMetadata[vchAddress].nCreateTime = timestamp;
diff --git a/test/functional/importmulti.py b/test/functional/importmulti.py
@@ -170,6 +170,18 @@ def run_test (self):
         assert_equal(address_assert['ismine'], True)
         assert_equal(address_assert['timestamp'], timestamp)
 
+        self.log.info("Should not import an address with private key if is already imported")
+        result = self.nodes[1].importmulti([{
+            "scriptPubKey": {
+                "address": address['address']
+            },
+            "timestamp": "now",
+            "keys": [ self.nodes[0].dumpprivkey(address['address']) ]
+        }])
+        assert_equal(result[0]['success'], False)
+        assert_equal(result[0]['error']['code'], -4)
+        assert_equal(result[0]['error']['message'], 'The wallet already contains the private key for this address or script')
+
         # Address + Private key + watchonly
         self.log.info("Should not import an address with private key and with watchonly")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,7 @@ UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, const int6`
`960`	`960`	`pwallet->SetAddressBook(vchAddress, label, "receive");`
`961`	`961`
`962`	`962`	`if (pwallet->HaveKey(vchAddress)) {`
`963`		`- return false;`
	`963`	`+ throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");`
`964`	`964`	`}`
`965`	`965`
`966`	`966`	`pwallet->mapKeyMetadata[vchAddress].nCreateTime = timestamp;`