Clean up functional wallet test amount calculation

It makes more sense to add the untrusted balance to the trusted one.
bitcoin · Apr 30, 2021 · a5c3d9c · a5c3d9c
1 parent 0b9c89b
commit a5c3d9c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/test/functional/wallet_send.py b/test/functional/wallet_send.py
@@ -38,10 +38,9 @@ def test_send(self, from_wallet, to_wallet=None, amount=None, data=None,
                   expect_error=None):
         assert (amount is None) != (data is None)
 
+        from_balance_before = from_wallet.getbalances()["mine"]["trusted"]
         if include_unsafe:
-            from_balance_before = from_wallet.getbalances()["mine"]["untrusted_pending"]
-        else:
-            from_balance_before = from_wallet.getbalances()["mine"]["trusted"]
+            from_balance_before += from_wallet.getbalances()["mine"]["untrusted_pending"]
 
         if to_wallet is None:
             assert amount is None
@@ -139,10 +138,9 @@ def test_send(self, from_wallet, to_wallet=None, amount=None, data=None,
             assert not "txid" in res
             assert "psbt" in res
 
+        from_balance = from_wallet.getbalances()["mine"]["trusted"]
         if include_unsafe:
-            from_balance = from_wallet.getbalances()["mine"]["untrusted_pending"]
-        else:
-            from_balance = from_wallet.getbalances()["mine"]["trusted"]
+            from_balance += from_wallet.getbalances()["mine"]["untrusted_pending"]
 
         if add_to_wallet and not include_watching:
             # Ensure transaction exists in the wallet: