zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add tx index within block to WalletTx struct

This commit is contained in:
Jack Grigg 2019-01-24 23:26:14 +00:00
parent 3b9dfc1e0b
commit e746f7b6f9
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zcash_client_backend/src/wallet.rs
View File

@ -13,6 +13,7 @@ use zcash_primitives::{
/// [`Transaction`]: zcash_primitives::transaction::Transaction
pub struct WalletTx {
pub txid: TxId,
pub index: usize,
pub num_spends: usize,
pub num_outputs: usize,
pub shielded_spends: Vec<WalletShieldedSpend>,

10
zcash_client_backend/src/welding_rig.rs
View File

@ -162,6 +162,7 @@ pub fn scan_block(
wtxs.push((
WalletTx {
txid,
index: tx.index as usize,
num_spends,
num_outputs,
shielded_spends,
@ -269,7 +270,11 @@ mod tests {
cb.set_height(height as u64);
// Add a random Sapling tx before ours
cb.vtx.push(random_compact_tx(&mut rng));
{
let mut tx = random_compact_tx(&mut rng);
tx.index = cb.vtx.len() as u64;
cb.vtx.push(tx);
}
let mut cspend = CompactSpend::new();
cspend.set_nf(nf.to_vec());
@ -283,6 +288,7 @@ mod tests {
ctx.set_hash(txid);
ctx.spends.push(cspend);
ctx.outputs.push(cout);
ctx.index = cb.vtx.len() as u64;
cb.vtx.push(ctx);
cb
@ -301,6 +307,7 @@ mod tests {
assert_eq!(txs.len(), 1);
let (tx, new_witnesses) = &txs[0];
assert_eq!(tx.index, 1);
assert_eq!(tx.num_spends, 1);
assert_eq!(tx.num_outputs, 1);
assert_eq!(tx.shielded_spends.len(), 0);
@ -329,6 +336,7 @@ mod tests {
assert_eq!(txs.len(), 1);
let (tx, new_witnesses) = &txs[0];
assert_eq!(tx.index, 1);
assert_eq!(tx.num_spends, 1);
assert_eq!(tx.num_outputs, 1);
assert_eq!(tx.shielded_spends.len(), 1);