mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2024-11-19 09:54:09 +01:00
Code Issues Projects Releases Wiki Activity

Rename mempool Stats -> Item

Browse Source
This commit is contained in:
Roman Zeyde 2018-06-12 23:42:19 +03:00
parent 1a117933ff
commit 456159fa09
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mempool.rs
View File

@ -91,13 +91,13 @@ impl ReadStore for MempoolStore {
} }
} }
struct Stats { struct Item {
tx: Transaction, tx: Transaction,
entry: MempoolEntry, entry: MempoolEntry,
} }
pub struct Tracker { pub struct Tracker {
stats: HashMap<Sha256dHash, Stats>, items: HashMap<Sha256dHash, Item>,
index: MempoolStore, index: MempoolStore,
histogram: Vec<(f32, u32)>, histogram: Vec<(f32, u32)>,
} }
@ -105,14 +105,14 @@ pub struct Tracker {
impl Tracker { impl Tracker {
pub fn new(metrics: &Metrics) -> Tracker { pub fn new(metrics: &Metrics) -> Tracker {
Tracker { Tracker {
stats: HashMap::new(), items: HashMap::new(),
index: MempoolStore::new(), index: MempoolStore::new(),
histogram: vec![], histogram: vec![],
} }
} }
pub fn get_txn(&self, txid: &Sha256dHash) -> Option<Transaction> { pub fn get_txn(&self, txid: &Sha256dHash) -> Option<Transaction> {
self.stats.get(txid).map(|stats| stats.tx.clone()) self.items.get(txid).map(|stats| stats.tx.clone())
} }
/// Returns vector of (fee_rate, vsize) pairs, where fee_{n-1} > fee_n and vsize_n is the /// Returns vector of (fee_rate, vsize) pairs, where fee_{n-1} > fee_n and vsize_n is the
@ -130,7 +130,7 @@ impl Tracker {
let new_txids = daemon let new_txids = daemon
.getmempooltxids() .getmempooltxids()
.chain_err(|| "failed to update mempool from daemon")?; .chain_err(|| "failed to update mempool from daemon")?;
let old_txids = HashSet::from_iter(self.stats.keys().cloned()); let old_txids = HashSet::from_iter(self.items.keys().cloned());
for txid in new_txids.difference(&old_txids) { for txid in new_txids.difference(&old_txids) {
let entry = match daemon.getmempoolentry(txid) { let entry = match daemon.getmempoolentry(txid) {
Ok(entry) => entry, Ok(entry) => entry,
@ -153,7 +153,7 @@ impl Tracker {
self.remove(txid); self.remove(txid);
} }
self.update_fee_histogram(); self.update_fee_histogram();
let vsize: u64 = self.stats let vsize: u64 = self.items
.values() .values()
.map(|stat| stat.entry.vsize() as u64) .map(|stat| stat.entry.vsize() as u64)
.sum(); .sum();
@ -163,18 +163,18 @@ impl Tracker {
fn add(&mut self, txid: &Sha256dHash, tx: Transaction, entry: MempoolEntry) { fn add(&mut self, txid: &Sha256dHash, tx: Transaction, entry: MempoolEntry) {
trace!("new tx: {}, {:.3}", txid, entry.fee_per_vbyte()); trace!("new tx: {}, {:.3}", txid, entry.fee_per_vbyte());
self.index.add(&tx); self.index.add(&tx);
self.stats.insert(*txid, Stats { tx, entry }); self.items.insert(*txid, Item { tx, entry });
} }
fn remove(&mut self, txid: &Sha256dHash) { fn remove(&mut self, txid: &Sha256dHash) {
let stats = self.stats let stats = self.items
.remove(txid) .remove(txid)
.expect(&format!("missing mempool tx {}", txid)); .expect(&format!("missing mempool tx {}", txid));
self.index.remove(&stats.tx); self.index.remove(&stats.tx);
} }
fn update_fee_histogram(&mut self) { fn update_fee_histogram(&mut self) {
let mut entries: Vec<&MempoolEntry> = self.stats.values().map(|stat| &stat.entry).collect(); let mut entries: Vec<&MempoolEntry> = self.items.values().map(|stat| &stat.entry).collect();
entries.sort_unstable_by(|e1, e2| { entries.sort_unstable_by(|e1, e2| {
e2.fee_per_vbyte().partial_cmp(&e1.fee_per_vbyte()).unwrap() e2.fee_per_vbyte().partial_cmp(&e1.fee_per_vbyte()).unwrap()
}); });