change test to use Balance

zcash_client_backend/src/data_api/testing/transparent.rs

@@ -136,7 +136,7 @@ where
     }
     st.scan_cached_blocks(start_height, 10);
 
-    let check_balance = |st: &TestState<_, DSF::DataStore, _>, min_confirmations: u32, expected| {
+    let check_balance = |st: &TestState<_, DSF::DataStore, _>, min_confirmations: u32, expected: &crate::data_api::Balance| {
         // Check the wallet summary returns the expected transparent balance.
         let summary = st
             .wallet()
@@ -146,7 +146,8 @@ where
         let balance = summary.account_balances().get(&account.id()).unwrap();
         // TODO: in the future, we will distinguish between available and total
         // balance according to `min_confirmations`
-        assert_eq!(balance.unshielded(), expected);
+        // assert_eq!(balance.unshielded(), expected);
+        assert_eq!(balance.unshielded_balance(), expected);
 
         // Check the older APIs for consistency.
         let mempool_height = st.wallet().chain_height().unwrap().unwrap() + 1;
@@ -157,7 +158,7 @@ where
                 .get(taddr)
                 .cloned()
                 .unwrap_or(NonNegativeAmount::ZERO),
-            expected,
+            expected.total(),
         );
         assert_eq!(
             st.wallet()
@@ -166,7 +167,7 @@ where
                 .into_iter()
                 .map(|utxo| utxo.value())
                 .sum::<Option<NonNegativeAmount>>(),
-            Some(expected),
+            Some(expected.spendable_value()),
         );
     };
 
@@ -175,7 +176,7 @@ where
     // and total balance, we should perform additional checks against available balance;
     // we use minconf 0 here because all transparent funds are considered shieldable,
     // irrespective of confirmation depth.
-    check_balance(&st, 0, NonNegativeAmount::ZERO);
+    check_balance(&st, 0, &Balance::ZERO);
 
     // Create a fake transparent output.
     let value = NonNegativeAmount::from_u64(100000).unwrap();
@@ -192,7 +193,12 @@ where
         .unwrap();
 
     // The wallet should detect the balance as available
-    check_balance(&st, 0, value);
+    let mut zero_conf_value = Balance::ZERO;
+
+    // add the spendable value to the expected balance
+    zero_conf_value.add_spendable_value(value).unwrap();
+
+    check_balance(&st, 0, &zero_conf_value);
 
     // Shield the output.
     let input_selector = GreedyInputSelector::new();
@@ -216,14 +222,14 @@ where
 
     // The wallet should have zero transparent balance, because the shielding
     // transaction can be mined.
-    check_balance(&st, 0, NonNegativeAmount::ZERO);
+    check_balance(&st, 0, &Balance::ZERO);
 
     // Mine the shielding transaction.
     let (mined_height, _) = st.generate_next_block_including(txid);
     st.scan_cached_blocks(mined_height, 1);
 
     // The wallet should still have zero transparent balance.
-    check_balance(&st, 0, NonNegativeAmount::ZERO);
+    check_balance(&st, 0, &Balance::ZERO);
 
     // Unmine the shielding transaction via a reorg.
     st.wallet_mut()
@@ -232,7 +238,7 @@ where
     assert_eq!(st.wallet().chain_height().unwrap(), Some(mined_height - 1));
 
     // The wallet should still have zero transparent balance.
-    check_balance(&st, 0, NonNegativeAmount::ZERO);
+    check_balance(&st, 0, &Balance::ZERO);
 
     // Expire the shielding transaction.
     let expiry_height = st
@@ -243,5 +249,5 @@ where
         .expiry_height();
     st.wallet_mut().update_chain_tip(expiry_height).unwrap();
 
-    check_balance(&st, 0, value);
+    check_balance(&st, 0, &zero_conf_value);
 }