[RPC] shielded_sendmany throwing an error if the operation failed instead of returning an error string.

furszy · furszy · commit 1b6f70179a19 · 2020-11-04T15:29:32.000-03:00
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -1685,7 +1685,9 @@ UniValue shielded_sendmany(const JSONRPCRequest& request) {
             ->setShieldedRecipients(shieldAddrRecipients)
             ->setTransparentRecipients(taddrRecipients)
             ->send(txHash);
-    return res ? txHash : res.m_error;
+
+    if (!res) throw JSONRPCError(RPC_WALLET_ERROR, res.m_error);
+    return txHash;
 }
 
 UniValue listaddressgroupings(const JSONRPCRequest& request)
diff --git a/test/functional/sapling_key_import_export.py b/test/functional/sapling_key_import_export.py
@@ -61,10 +61,7 @@ def get_private_balance(node):
         amountTo = 10 * 250 - fee
         # Shield Alice's coinbase funds to her shield_addr
         alice_addr = alice.getnewshieldedaddress()
-        txid = alice.shielded_sendmany(fromAddress, [{"address": alice_addr, "amount": Decimal(amountTo)}])
-        self.sync_all()
-        miner.generate(1)
-        self.sync_all()
+        txid = shielded_send(alice, fromAddress, alice_addr, amountTo)
 
         # Now get a pristine address for receiving transfers:
         bob_addr = bob.getnewshieldedaddress()
diff --git a/test/functional/sapling_wallet.py b/test/functional/sapling_wallet.py
@@ -22,6 +22,9 @@ def set_test_params(self):
         saplingUpgrade = ['-nuparams=v5_dummy:1']
         self.extra_args = [saplingUpgrade, saplingUpgrade, saplingUpgrade, saplingUpgrade]
 
+    def check_tx_priority(self, mempool, mytxid):
+        assert(Decimal(mempool[mytxid]['startingpriority']) == Decimal('1E+25'))
+
     def run_test(self):
         # generate 100 more to activate sapling in regtest
         self.nodes[2].generate(12)
@@ -54,13 +57,12 @@ def run_test(self):
         recipients.append({"address": saplingAddr0, "amount": Decimal('10')})
         coinstake = get_coinstake_address(self.nodes[0])
         mytxid = self.nodes[0].shielded_sendmany(coinstake, recipients, 1, nMinDefaultSaplingFee)
-        assert(mytxid != "SendTransaction: CommitTransaction failed")
 
         self.sync_all()
 
         # Verify priority of tx is INF_PRIORITY, defined as 1E+25 (10000000000000000000000000)
         mempool = self.nodes[0].getrawmempool(True)
-        assert(Decimal(mempool[mytxid]['startingpriority']) == Decimal('1E+25'))
+        self.check_tx_priority(mempool, mytxid)
 
         # Shield another coinbase UTXO
         mytxid = self.nodes[0].shielded_sendmany(get_coinstake_address(self.nodes[0]), recipients, 1, nMinDefaultSaplingFee)
@@ -85,7 +87,7 @@ def run_test(self):
 
         # Verify priority of tx is MAX_PRIORITY, defined as 1E+25 (10000000000000000000000000)
         mempool = self.nodes[0].getrawmempool(True)
-        assert(Decimal(mempool[mytxid]['startingpriority']) == Decimal('1E+25'))
+        self.check_tx_priority(mempool, mytxid)
 
         self.nodes[2].generate(1)
         self.sync_all()
@@ -103,12 +105,11 @@ def run_test(self):
         recipients.append({"address": saplingAddr0, "amount": Decimal('5')})
         recipients.append({"address": taddr1, "amount": Decimal('5')})
         mytxid = self.nodes[1].shielded_sendmany(saplingAddr1, recipients, 1, nMinDefaultSaplingFee)
-        assert(mytxid != "SendTransaction: CommitTransaction failed")
         self.sync_all()
 
         # Verify priority of tx is MAX_PRIORITY, defined as 1E+25 (10000000000000000000000000)
         mempool = self.nodes[1].getrawmempool(True)
-        assert(Decimal(mempool[mytxid]['startingpriority']) == Decimal('1E+25'))
+        self.check_tx_priority(mempool, mytxid)
 
         self.nodes[2].generate(1)
         self.sync_all()
