Nits from ryanofsky. To squash

jnewbery · jnewbery · commit 5158a1e2a258 · 2017-03-07T16:41:33.000-05:00
diff --git a/qa/rpc-tests/bumpfee.py b/qa/rpc-tests/bumpfee.py
@@ -159,7 +159,7 @@ def test_bumpfee_with_descendant_fails(rbf_node, rbf_node_address, dest_address)
     tx = rbf_node.createrawtransaction([{"txid": parent_id, "vout": 0}], {dest_address: 0.00020000})
     tx = rbf_node.signrawtransaction(tx)
     txid = rbf_node.sendrawtransaction(tx["hex"])
-    assert_raises_jsonrpc(-4, "Transaction has descendants in the wallet", rbf_node.bumpfee, parent_id)
+    assert_raises_jsonrpc(-8, "Transaction has descendants in the wallet", rbf_node.bumpfee, parent_id)
 
 
 def test_small_output_fails(rbf_node, dest_address):
diff --git a/qa/rpc-tests/importprunedfunds.py b/qa/rpc-tests/importprunedfunds.py
@@ -107,7 +107,7 @@ def run_test(self):
         assert_equal(address_info['ismine'], True)
 
         #Remove transactions
-        assert_raises_jsonrpc(-4, "does not exist", self.nodes[1].removeprunedfunds, txnid1)
+        assert_raises_jsonrpc(-8, "Transaction does not exist in wallet.", self.nodes[1].removeprunedfunds, txnid1)
 
         balance1 = self.nodes[1].getbalance("*", 0, True)
         assert_equal(balance1, Decimal('0.075'))
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -354,7 +354,7 @@ UniValue removeprunedfunds(const JSONRPCRequest& request)
     }
 
     if(vHashOut.empty()) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Transaction does not exist in wallet.");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction does not exist in wallet.");
     }
 
     return NullUniValue;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -2862,14 +2862,14 @@ UniValue bumpfee(const JSONRPCRequest& request)
     CWalletTx& wtx = pwallet->mapWallet[hash];
 
     if (pwallet->HasWalletSpend(hash)) {
-        throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has descendants in the wallet");
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the wallet");
     }
 
     {
         LOCK(mempool.cs);
         auto it = mempool.mapTx.find(hash);
         if (it != mempool.mapTx.end() && it->GetCountWithDescendants() > 1) {
-            throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has descendants in the mempool");
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the mempool");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ UniValue removeprunedfunds(const JSONRPCRequest& request)`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`if(vHashOut.empty()) {`
`357`		`- throw JSONRPCError(RPC_WALLET_ERROR, "Transaction does not exist in wallet.");`
	`357`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction does not exist in wallet.");`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`return NullUniValue;`
Original file line number	Diff line number	Diff line change
`@@ -2862,14 +2862,14 @@ UniValue bumpfee(const JSONRPCRequest& request)`
`2862`	`2862`	`CWalletTx& wtx = pwallet->mapWallet[hash];`
`2863`	`2863`
`2864`	`2864`	`if (pwallet->HasWalletSpend(hash)) {`
`2865`		`- throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has descendants in the wallet");`
	`2865`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the wallet");`
`2866`	`2866`	`}`
`2867`	`2867`
`2868`	`2868`	`{`
`2869`	`2869`	`LOCK(mempool.cs);`
`2870`	`2870`	`auto it = mempool.mapTx.find(hash);`
`2871`	`2871`	`if (it != mempool.mapTx.end() && it->GetCountWithDescendants() > 1) {`
`2872`		`- throw JSONRPCError(RPC_WALLET_ERROR, "Transaction has descendants in the mempool");`
	`2872`	`+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Transaction has descendants in the mempool");`
`2873`	`2873`	`}`
`2874`	`2874`	`}`
`2875`	`2875`