From 2c38081f06a883042257d301245fd18b5b387b28 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Wed, 22 Mar 2023 09:22:51 +0000 Subject: [PATCH] contract test fixes (#676) --- controller/tests/contract_accounts.rs | 14 +++++++------- controller/tests/contract_accounts_switch.rs | 10 +++++----- controller/tests/contract_rsr.rs | 4 ++-- controller/tests/contract_self_spend.rs | 2 +- controller/tests/contract_self_spend_custom.rs | 2 +- controller/tests/contract_srs.rs | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/controller/tests/contract_accounts.rs b/controller/tests/contract_accounts.rs index 25ea5bc7..7d846b79 100644 --- a/controller/tests/contract_accounts.rs +++ b/controller/tests/contract_accounts.rs @@ -89,7 +89,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error assert_eq!(wallet1_info.total, 5 * reward); assert_eq!(wallet1_info.amount_currently_spendable, (5 - cm) * reward); // check tx log as well - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 5); Ok(()) })?; @@ -110,7 +110,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error assert_eq!(wallet1_info.total, 7 * reward); assert_eq!(wallet1_info.amount_currently_spendable, 7 * reward); // check tx log as well - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 7); Ok(()) })?; @@ -129,7 +129,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error assert_eq!(wallet1_info.total, 0,); assert_eq!(wallet1_info.amount_currently_spendable, 0,); // check tx log as well - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 0); Ok(()) })?; @@ -190,7 +190,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?; assert!(wallet1_refreshed); assert_eq!(wallet1_info.last_confirmed_height, 13); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 9); Ok(()) })?; @@ -205,7 +205,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error assert_eq!(wallet1_info.last_confirmed_height, 12); let (_, wallet1_info) = api.retrieve_summary_info(m, true, 1)?; assert_eq!(wallet1_info.last_confirmed_height, 13); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; println!("{:?}", txs); assert_eq!(txs.len(), 5); Ok(()) @@ -216,7 +216,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error let (wallet2_refreshed, wallet2_info) = api.retrieve_summary_info(m, true, 1)?; assert!(wallet2_refreshed); assert_eq!(wallet2_info.last_confirmed_height, 13); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 1); Ok(()) })?; @@ -234,7 +234,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error assert_eq!(wallet2_info.total, 0,); assert_eq!(wallet2_info.amount_currently_spendable, 0,); // check tx log as well - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 0); Ok(()) })?; diff --git a/controller/tests/contract_accounts_switch.rs b/controller/tests/contract_accounts_switch.rs index 74d94f9e..80c9c438 100644 --- a/controller/tests/contract_accounts_switch.rs +++ b/controller/tests/contract_accounts_switch.rs @@ -64,7 +64,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet assert_eq!(wallet1_info.last_confirmed_height, 10); assert_eq!(wallet1_info.total, 1 * reward); assert_eq!(wallet1_info.amount_currently_spendable, 1 * reward); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 1); Ok(()) })?; @@ -84,7 +84,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet assert_eq!(wallet1_info.total, 2 * reward); assert_eq!(wallet1_info.amount_currently_spendable, 2 * reward); // check tx log as well - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 2); Ok(()) })?; @@ -158,7 +158,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet 3 * reward + core::libtx::tx_fee(2, 2, 1) // we have received a block reward and the tx fee (payjoin) ); assert_eq!(wallet1_info.amount_currently_spendable, 2 * reward); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 3); Ok(()) })?; @@ -176,7 +176,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet wallet1_info.total, 1 * reward - 5_000_000_000 - my_fee_contribution(1, 1, 1, 2)?.fee() // we subtract also our fee contribution ); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 2); Ok(()) })?; @@ -194,7 +194,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet wallet2_info.total, 4 * reward + 5_000_000_000 - my_fee_contribution(1, 1, 1, 2)?.fee() // we subtract also our fee contribution for a payjoin ); - let (_, txs) = api.retrieve_txs(m, true, None, None)?; + let (_, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(txs.len(), 5); Ok(()) })?; diff --git a/controller/tests/contract_rsr.rs b/controller/tests/contract_rsr.rs index 91ad6940..a3ba8f0a 100644 --- a/controller/tests/contract_rsr.rs +++ b/controller/tests/contract_rsr.rs @@ -92,7 +92,7 @@ fn contract_rsr_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error> // Assert changes in receive wallet wallet::controller::owner_single_use(Some(recv_wallet.clone()), recv_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len(), 5); // 4 mined and 1 received @@ -119,7 +119,7 @@ fn contract_rsr_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error> // Assert changes in send wallet wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len() as u64, bh - 4 + 1); // send_wallet didn't mine 4 blocks and made 1 tx diff --git a/controller/tests/contract_self_spend.rs b/controller/tests/contract_self_spend.rs index dddaf209..5b23e375 100644 --- a/controller/tests/contract_self_spend.rs +++ b/controller/tests/contract_self_spend.rs @@ -80,7 +80,7 @@ fn contract_self_spend_tx_impl(test_dir: &'static str) -> Result<(), libwallet:: // Assert changes in send wallet wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx diff --git a/controller/tests/contract_self_spend_custom.rs b/controller/tests/contract_self_spend_custom.rs index fc3f601b..e54a4d93 100644 --- a/controller/tests/contract_self_spend_custom.rs +++ b/controller/tests/contract_self_spend_custom.rs @@ -99,7 +99,7 @@ fn contract_self_spend_custom_tx_impl(test_dir: &'static str) -> Result<(), libw // Assert changes in send wallet wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx diff --git a/controller/tests/contract_srs.rs b/controller/tests/contract_srs.rs index ce0148f7..704ac4d2 100644 --- a/controller/tests/contract_srs.rs +++ b/controller/tests/contract_srs.rs @@ -91,7 +91,7 @@ fn contract_srs_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error> // Assert changes in receive wallet wallet::controller::owner_single_use(Some(recv_wallet.clone()), recv_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len(), 5); // 4 mined and 1 received @@ -113,7 +113,7 @@ fn contract_srs_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error> // Assert changes in send wallet wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { let (_, wallet_info) = api.retrieve_summary_info(m, true, 1)?; - let (refreshed, txs) = api.retrieve_txs(m, true, None, None)?; + let (refreshed, txs) = api.retrieve_txs(m, true, None, None, None)?; assert_eq!(wallet_info.last_confirmed_height, bh); assert!(refreshed); assert_eq!(txs.len() as u64, bh - 4 + 1); // send wallet didn't mine 4 blocks and made 1 tx