diff --git a/src/bank.rs b/src/bank.rs index 37c32acde0..64370355e7 100644 --- a/src/bank.rs +++ b/src/bank.rs @@ -114,7 +114,7 @@ impl Bank { /// Create an Bank using a deposit. pub fn new_from_deposit(deposit: &Payment) -> Self { let bank = Self::default(); - bank.apply_payment(deposit); + bank.apply_payment(deposit, &mut bank.balances.write().unwrap()); bank } @@ -130,8 +130,7 @@ impl Bank { } /// Commit funds to the `payment.to` party. - fn apply_payment(&self, payment: &Payment) { - let mut balances = self.balances.write().unwrap(); + fn apply_payment(&self, payment: &Payment, balances: &mut HashMap) { if balances.contains_key(&payment.to) { *balances.get_mut(&payment.to).unwrap() += payment.tokens; } else { @@ -206,8 +205,7 @@ impl Bank { /// Deduct tokens from the 'from' address the account has sufficient /// funds and isn't a duplicate. - fn apply_debits(&self, tx: &Transaction) -> Result<()> { - let mut bals = self.balances.write().unwrap(); + fn apply_debits(&self, tx: &Transaction, bals: &mut HashMap) -> Result<()> { let mut purge = false; { let option = bals.get_mut(&tx.from); @@ -243,7 +241,7 @@ impl Bank { /// Apply only a transaction's credits. Credits from multiple transactions /// may safely be applied in parallel. - fn apply_credits(&self, tx: &Transaction) { + fn apply_credits(&self, tx: &Transaction, balances: &mut HashMap) { match &tx.instruction { Instruction::NewContract(contract) => { let mut plan = contract.plan.clone(); @@ -252,7 +250,7 @@ impl Bank { .expect("timestamp creation in apply_credits"))); if let Some(payment) = plan.final_payment() { - self.apply_payment(&payment); + self.apply_payment(&payment, balances); } else { let mut pending = self.pending .write() @@ -272,8 +270,9 @@ impl Bank { /// Process a Transaction. If it contains a payment plan that requires a witness /// to progress, the payment plan will be stored in the bank. fn process_transaction(&self, tx: &Transaction) -> Result<()> { - self.apply_debits(tx)?; - self.apply_credits(tx); + let bals = &mut self.balances.write().unwrap(); + self.apply_debits(tx, bals)?; + self.apply_credits(tx, bals); self.transaction_count.fetch_add(1, Ordering::Relaxed); Ok(()) } @@ -281,11 +280,12 @@ impl Bank { /// Process a batch of transactions. #[must_use] pub fn process_transactions(&self, txs: Vec) -> Vec> { + let bals = &mut self.balances.write().unwrap(); debug!("processing Transactions {}", txs.len()); let txs_len = txs.len(); let now = Instant::now(); let results: Vec<_> = txs.into_iter() - .map(|tx| self.apply_debits(&tx).map(|_| tx)) + .map(|tx| self.apply_debits(&tx, bals).map(|_| tx)) .collect(); // Calling collect() here forces all debits to complete before moving on. let debits = now.elapsed(); @@ -295,7 +295,7 @@ impl Bank { .into_iter() .map(|result| { result.map(|tx| { - self.apply_credits(&tx); + self.apply_credits(&tx, bals); tx }) }) @@ -387,7 +387,7 @@ impl Bank { None }.expect("invalid ledger, needs to start with a contract"); - self.apply_payment(&deposit); + self.apply_payment(&deposit, &mut self.balances.write().unwrap()); self.register_entry_id(&entry0.id); self.register_entry_id(&entry1.id); @@ -406,7 +406,7 @@ impl Bank { { e.get_mut().apply_witness(&Witness::Signature(from)); if let Some(payment) = e.get().final_payment() { - self.apply_payment(&payment); + self.apply_payment(&payment, &mut self.balances.write().unwrap()); e.remove_entry(); } }; @@ -455,7 +455,7 @@ impl Bank { .read() .expect("'last_time' read lock when creating timestamp"))); if let Some(payment) = plan.final_payment() { - self.apply_payment(&payment); + self.apply_payment(&payment, &mut self.balances.write().unwrap()); completed.push(key.clone()); } }