Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-07-31 12:21:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:adityapk00/zecwallet-light-cli

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-29 14:45:04 -07:00
parent 8504a61225 25c1e35192
commit fe82c0b430
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/lightwallet.rs
View File

@@ -767,7 +767,7 @@ impl LightWallet {
None => true
}
})
.map(|nd| if nd.spent.is_none() { nd.note.value } else { 0 })
.map(|nd| if nd.spent.is_none() && nd.unconfirmed_spent.is_none() { nd.note.value } else { 0 })
.sum::<u64>()
})
.sum::<u64>()

12
lib/src/lightwallet/tests.rs
View File

@@ -706,6 +706,12 @@ fn test_z_spend_to_z() {
let branch_id = u32::from_str_radix("2bb40e60", 16).unwrap();
let (ss, so) = get_sapling_params().unwrap();
// Make sure that the balance exists
{
assert_eq!(wallet.zbalance(None), AMOUNT1);
assert_eq!(wallet.verified_zbalance(None), AMOUNT1);
}
// Create a tx and send to address
let raw_tx = wallet.send_to_address(branch_id, &ss, &so,
vec![(&ext_address, AMOUNT_SENT, Some(outgoing_memo.clone()))]).unwrap();
@@ -736,6 +742,12 @@ fn test_z_spend_to_z() {
assert_eq!(mem[&sent_txid].outgoing_metadata[0].memo.to_utf8().unwrap().unwrap(), outgoing_memo);
}
{
// The wallet should deduct this from the balance and verified balance
assert_eq!(wallet.zbalance(None), 0);
assert_eq!(wallet.verified_zbalance(None), 0);
}
let mut cb3 = FakeCompactBlock::new(2, block_hash);
cb3.add_tx(&sent_tx);
wallet.scan_block(&cb3.as_bytes()).unwrap();