Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-02-01 17:01:10 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

contract test fixes (#676)

Browse source
This commit is contained in:
Yeastplume 2023-03-22 09:22:51 +00:00 committed by GitHub
parent f0cf8b0a7d
commit 2c38081f06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controller/tests/contract_accounts.rs
View file

@ -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.total, 5 * reward);
assert_eq!(wallet1_info.amount_currently_spendable, (5 - cm) * reward); assert_eq!(wallet1_info.amount_currently_spendable, (5 - cm) * reward);
// check tx log as well // 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); assert_eq!(txs.len(), 5);
Ok(()) 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.total, 7 * reward);
assert_eq!(wallet1_info.amount_currently_spendable, 7 * reward); assert_eq!(wallet1_info.amount_currently_spendable, 7 * reward);
// check tx log as well // 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); assert_eq!(txs.len(), 7);
Ok(()) 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.total, 0,);
assert_eq!(wallet1_info.amount_currently_spendable, 0,); assert_eq!(wallet1_info.amount_currently_spendable, 0,);
// check tx log as well // 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); assert_eq!(txs.len(), 0);
Ok(()) 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)?; let (wallet1_refreshed, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
assert!(wallet1_refreshed); assert!(wallet1_refreshed);
assert_eq!(wallet1_info.last_confirmed_height, 13); 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); assert_eq!(txs.len(), 9);
Ok(()) Ok(())
})?; })?;
@ -205,7 +205,7 @@ fn contract_accounts_impl(test_dir: &'static str) -> Result<(), libwallet::Error
assert_eq!(wallet1_info.last_confirmed_height, 12); assert_eq!(wallet1_info.last_confirmed_height, 12);
let (_, wallet1_info) = api.retrieve_summary_info(m, true, 1)?; let (_, wallet1_info) = api.retrieve_summary_info(m, true, 1)?;
assert_eq!(wallet1_info.last_confirmed_height, 13); 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); println!("{:?}", txs);
assert_eq!(txs.len(), 5); assert_eq!(txs.len(), 5);
Ok(()) 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)?; let (wallet2_refreshed, wallet2_info) = api.retrieve_summary_info(m, true, 1)?;
assert!(wallet2_refreshed); assert!(wallet2_refreshed);
assert_eq!(wallet2_info.last_confirmed_height, 13); 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); assert_eq!(txs.len(), 1);
Ok(()) 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.total, 0,);
assert_eq!(wallet2_info.amount_currently_spendable, 0,); assert_eq!(wallet2_info.amount_currently_spendable, 0,);
// check tx log as well // 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); assert_eq!(txs.len(), 0);
Ok(()) Ok(())
})?; })?;

10
controller/tests/contract_accounts_switch.rs
View file

@ -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.last_confirmed_height, 10);
assert_eq!(wallet1_info.total, 1 * reward); assert_eq!(wallet1_info.total, 1 * reward);
assert_eq!(wallet1_info.amount_currently_spendable, 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); assert_eq!(txs.len(), 1);
Ok(()) 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.total, 2 * reward);
assert_eq!(wallet1_info.amount_currently_spendable, 2 * reward); assert_eq!(wallet1_info.amount_currently_spendable, 2 * reward);
// check tx log as well // 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); assert_eq!(txs.len(), 2);
Ok(()) 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) 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); 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); assert_eq!(txs.len(), 3);
Ok(()) Ok(())
})?; })?;
@ -176,7 +176,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet
wallet1_info.total, wallet1_info.total,
1 * reward - 5_000_000_000 - my_fee_contribution(1, 1, 1, 2)?.fee() // we subtract also our fee contribution 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); assert_eq!(txs.len(), 2);
Ok(()) Ok(())
})?; })?;
@ -194,7 +194,7 @@ fn contract_accounts_switch_impl(test_dir: &'static str) -> Result<(), libwallet
wallet2_info.total, 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 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); assert_eq!(txs.len(), 5);
Ok(()) Ok(())
})?; })?;

4
controller/tests/contract_rsr.rs
View file

@ -92,7 +92,7 @@ fn contract_rsr_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error>
// Assert changes in receive wallet // Assert changes in receive wallet
wallet::controller::owner_single_use(Some(recv_wallet.clone()), recv_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len(), 5); // 4 mined and 1 received 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 // Assert changes in send wallet
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len() as u64, bh - 4 + 1); // send_wallet didn't mine 4 blocks and made 1 tx assert_eq!(txs.len() as u64, bh - 4 + 1); // send_wallet didn't mine 4 blocks and made 1 tx

2
controller/tests/contract_self_spend.rs
View file

@ -80,7 +80,7 @@ fn contract_self_spend_tx_impl(test_dir: &'static str) -> Result<(), libwallet::
// Assert changes in send wallet // Assert changes in send wallet
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx

2
controller/tests/contract_self_spend_custom.rs
View file

@ -99,7 +99,7 @@ fn contract_self_spend_custom_tx_impl(test_dir: &'static str) -> Result<(), libw
// Assert changes in send wallet // Assert changes in send wallet
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx assert_eq!(txs.len() as u64, bh + 1); // send wallet didn't mine 4 blocks and made 1 tx

4
controller/tests/contract_srs.rs
View file

@ -91,7 +91,7 @@ fn contract_srs_tx_impl(test_dir: &'static str) -> Result<(), libwallet::Error>
// Assert changes in receive wallet // Assert changes in receive wallet
wallet::controller::owner_single_use(Some(recv_wallet.clone()), recv_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len(), 5); // 4 mined and 1 received 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 // Assert changes in send wallet
wallet::controller::owner_single_use(Some(send_wallet.clone()), send_mask, None, |api, m| { 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 (_, 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_eq!(wallet_info.last_confirmed_height, bh);
assert!(refreshed); assert!(refreshed);
assert_eq!(txs.len() as u64, bh - 4 + 1); // send wallet didn't mine 4 blocks and made 1 tx assert_eq!(txs.len() as u64, bh - 4 + 1); // send wallet didn't mine 4 blocks and made 1 tx