gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a way of getting transaction errors out of the bank

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-09-21 10:50:07 -06:00
parent bc88473030
commit 22e77c9485
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bank.rs
View File

@ -17,7 +17,7 @@ use mint::Mint;
use payment_plan::Payment; use payment_plan::Payment;
use signature::{Keypair, Pubkey, Signature}; use signature::{Keypair, Pubkey, Signature};
use std; use std;
use std::collections::{BTreeMap, HashMap, HashSet, VecDeque}; use std::collections::{BTreeMap, HashMap, VecDeque};
use std::result; use std::result;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::RwLock; use std::sync::RwLock;
@ -125,7 +125,7 @@ pub struct Bank {
/// Mapping of hashes to signature sets along with timestamp. The bank uses this data to /// Mapping of hashes to signature sets along with timestamp. The bank uses this data to
/// reject transactions with signatures its seen before /// reject transactions with signatures its seen before
last_ids_sigs: RwLock<HashMap<Hash, (HashSet<Signature>, u64)>>, last_ids_sigs: RwLock<HashMap<Hash, (HashMap<Signature, Result<()>>, u64)>>,
/// The number of transactions the bank has processed without error since the /// The number of transactions the bank has processed without error since the
/// start of the ledger. /// start of the ledger.
@ -202,11 +202,14 @@ impl Bank {
} }
/// Store the given signature. The bank will reject any transaction with the same signature. /// Store the given signature. The bank will reject any transaction with the same signature.
fn reserve_signature(signatures: &mut HashSet<Signature>, signature: &Signature) -> Result<()> { fn reserve_signature(
if let Some(signature) = signatures.get(signature) { signatures: &mut HashMap<Signature, Result<()>>,
signature: &Signature,
) -> Result<()> {
if let Some(_result) = signatures.get(signature) {
return Err(BankError::DuplicateSignature(*signature)); return Err(BankError::DuplicateSignature(*signature));
} }
signatures.insert(*signature); signatures.insert(*signature, Ok(()));
Ok(()) Ok(())
} }
@ -262,7 +265,7 @@ impl Bank {
let id = last_ids.pop_front().unwrap(); let id = last_ids.pop_front().unwrap();
last_ids_sigs.remove(&id); last_ids_sigs.remove(&id);
} }
last_ids_sigs.insert(*last_id, (HashSet::new(), timestamp())); last_ids_sigs.insert(*last_id, (HashMap::new(), timestamp()));
last_ids.push_back(*last_id); last_ids.push_back(*last_id);
} }
@ -673,7 +676,7 @@ impl Bank {
.read() .read()
.expect("'last_ids_sigs' read lock"); .expect("'last_ids_sigs' read lock");
for (_hash, signatures) in last_ids_sigs.iter() { for (_hash, signatures) in last_ids_sigs.iter() {
if signatures.0.contains(signature) { if signatures.0.contains_key(signature) {
return true; return true;
} }
} }