Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tests

Browse source
This commit is contained in:
Quentin Le Sceller 2018-11-13 11:57:43 +01:00
parent 2ab31d18a3
commit e923b90ad2
No known key found for this signature in database
GPG key ID: 76248AC90C33D34F
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wallet/tests/transaction.rs
View file

@ -398,14 +398,14 @@ fn tx_rollback(test_dir: &str) -> Result<(), libwallet::Error> {
// Wallet 1 decides to roll back instead // Wallet 1 decides to roll back instead
wallet::controller::owner_single_use(wallet1.clone(), |api| { wallet::controller::owner_single_use(wallet1.clone(), |api| {
// can't roll back coinbase // can't roll back coinbase
let res = api.cancel_tx(1); let res = api.cancel_tx(Some(1), None);
assert!(res.is_err()); assert!(res.is_err());
let (_, txs) = api.retrieve_txs(true, None, None)?; let (_, txs) = api.retrieve_txs(true, None, None)?;
let tx = txs let tx = txs
.iter() .iter()
.find(|t| t.tx_slate_id == Some(slate.id)) .find(|t| t.tx_slate_id == Some(slate.id))
.unwrap(); .unwrap();
api.cancel_tx(tx.id)?; api.cancel_tx(Some(tx.id), None)?;
let (refreshed, wallet1_info) = api.retrieve_summary_info(true)?; let (refreshed, wallet1_info) = api.retrieve_summary_info(true)?;
assert!(refreshed); assert!(refreshed);
println!( println!(
@ -419,7 +419,7 @@ fn tx_rollback(test_dir: &str) -> Result<(), libwallet::Error> {
(wallet1_info.last_confirmed_height - cm) * reward (wallet1_info.last_confirmed_height - cm) * reward
); );
// can't roll back again // can't roll back again
let res = api.cancel_tx(tx.id); let res = api.cancel_tx(Some(tx.id), None);
assert!(res.is_err()); assert!(res.is_err());
Ok(()) Ok(())
@ -432,14 +432,14 @@ fn tx_rollback(test_dir: &str) -> Result<(), libwallet::Error> {
.iter() .iter()
.find(|t| t.tx_slate_id == Some(slate.id)) .find(|t| t.tx_slate_id == Some(slate.id))
.unwrap(); .unwrap();
api.cancel_tx(tx.id)?; api.cancel_tx(Some(tx.id), None)?;
let (refreshed, wallet2_info) = api.retrieve_summary_info(true)?; let (refreshed, wallet2_info) = api.retrieve_summary_info(true)?;
assert!(refreshed); assert!(refreshed);
// check all eligible inputs should be now be spendable // check all eligible inputs should be now be spendable
assert_eq!(wallet2_info.amount_currently_spendable, 0,); assert_eq!(wallet2_info.amount_currently_spendable, 0,);
assert_eq!(wallet2_info.total, 0,); assert_eq!(wallet2_info.total, 0,);
// can't roll back again // can't roll back again
let res = api.cancel_tx(tx.id); let res = api.cancel_tx(Some(tx.id), None);
assert!(res.is_err()); assert!(res.is_err());
Ok(()) Ok(())