From 42480ea37bd2b15024ba4f2f500bda84ef9f786e Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Tue, 17 Nov 2020 16:29:03 +0100 Subject: [PATCH] Bring less data around --- src/blockchain/utils.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blockchain/utils.rs b/src/blockchain/utils.rs index 4fa51e42..4b3e232f 100644 --- a/src/blockchain/utils.rs +++ b/src/blockchain/utils.rs @@ -308,7 +308,7 @@ fn save_transaction_details_and_utxos( timestamp: u64, height: Option, updates: &mut dyn BatchOperations, - utxo_deps: &HashMap, + utxo_deps: &HashMap, ) -> Result<(), Error> { let tx = db .get_raw_tx(txid)? @@ -343,8 +343,8 @@ fn save_transaction_details_and_utxos( } // removes conflicting UTXO if any (generated from same inputs, like for example RBF) - if let Some(utxo) = utxo_deps.get(&input.previous_output) { - updates.del_utxo(&utxo.outpoint)?; + if let Some(outpoint) = utxo_deps.get(&input.previous_output) { + updates.del_utxo(&outpoint)?; } } @@ -386,7 +386,7 @@ fn save_transaction_details_and_utxos( fn utxos_deps( db: &mut D, tx_raw_in_db: &HashMap, -) -> Result, Error> { +) -> Result, Error> { let utxos = db.iter_utxos()?; let mut utxos_deps = HashMap::new(); for utxo in utxos { @@ -394,7 +394,7 @@ fn utxos_deps( .get(&utxo.outpoint.txid) .ok_or_else(|| Error::TransactionNotFound)?; for input in from_tx.input.iter() { - utxos_deps.insert(input.previous_output, utxo.clone()); + utxos_deps.insert(input.previous_output, utxo.outpoint); } } Ok(utxos_deps)