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

Fix a few small nits in mempool module

Browse Source
This commit is contained in:
Roman Zeyde 2018-05-18 21:48:13 +03:00
parent d6ea025861
commit 1944bf2bd5
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mempool.rs
View File

@ -25,16 +25,6 @@ pub struct Tracker {
stats: HashMap<Sha256dHash, Stats>, stats: HashMap<Sha256dHash, Stats>,
} }
trait InSeconds {
fn in_seconds(&self) -> f64;
}
impl InSeconds for Duration {
fn in_seconds(&self) -> f64 {
self.as_secs() as f64 + (self.subsec_nanos() as f64) * 1e-9
}
}
impl Tracker { impl Tracker {
pub fn new() -> Tracker { pub fn new() -> Tracker {
Tracker { Tracker {
@ -69,8 +59,8 @@ impl Tracker {
.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.stats.keys().cloned());
let t = Instant::now(); let t = Instant::now();
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,
Err(err) => { Err(err) => {
// e.g. new block or RBF // e.g. new block or RBF
@ -78,7 +68,7 @@ impl Tracker {
continue; continue;
} }
}; };
let tx = match daemon.gettransaction(&txid) { let tx = match daemon.gettransaction(txid) {
Ok(tx) => tx, Ok(tx) => tx,
Err(err) => { Err(err) => {
// e.g. new block or RBF // e.g. new block or RBF
@ -87,7 +77,7 @@ impl Tracker {
} }
}; };
trace!("new tx: {}, {:.3}", txid, entry.fee_per_vbyte(),); trace!("new tx: {}, {:.3}", txid, entry.fee_per_vbyte(),);
self.stats.insert(txid, Stats::new(tx, entry)); self.stats.insert(*txid, Stats::new(tx, entry));
} }
for txid in old_txids.difference(&new_txids) { for txid in old_txids.difference(&new_txids) {
self.stats.remove(txid); self.stats.remove(txid);
@ -101,3 +91,13 @@ impl Tracker {
Ok(()) Ok(())
} }
} }
trait InSeconds {
fn in_seconds(&self) -> f64;
}
impl InSeconds for Duration {
fn in_seconds(&self) -> f64 {
self.as_secs() as f64 + (self.subsec_nanos() as f64) * 1e-9
}
}