GlcoinCore/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2026-08-17 13:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix #317

Browse source
This commit is contained in:
Roman Zeyde 2020-11-06 16:28:39 +02:00
parent 8f2f53303a
commit c88a0dc331
No known key found for this signature in database
GPG key ID: 87CAE5FA46917CBB
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon.rs
View file

@ -121,7 +121,7 @@ pub struct MempoolEntry {
}
impl MempoolEntry {
fn new(fee: u64, vsize: u32) -> MempoolEntry {
pub(crate) fn new(fee: u64, vsize: u32) -> MempoolEntry {
MempoolEntry {
fee,
vsize,

38
src/mempool.rs
View file

@ -270,18 +270,42 @@ impl Tracker {
fn electrum_fees(entries: &[&MempoolEntry]) -> Vec<(f32, u32)> {
let mut histogram = vec![];
let mut bin_size = 0;
let mut last_fee_rate = None;
let mut last_fee_rate = 0.0;
for e in entries.iter().rev() {
last_fee_rate = Some(e.fee_per_vbyte());
bin_size += e.vsize();
if bin_size > VSIZE_BIN_WIDTH {
let fee_rate = e.fee_per_vbyte();
if bin_size > VSIZE_BIN_WIDTH && last_fee_rate != fee_rate {
// vsize of transactions paying >= e.fee_per_vbyte()
histogram.push((e.fee_per_vbyte(), bin_size));
histogram.push((last_fee_rate, bin_size));
bin_size = 0;
}
last_fee_rate = fee_rate;
bin_size += e.vsize();
}
if let Some(fee_rate) = last_fee_rate {
histogram.push((fee_rate, bin_size));
if bin_size > 0 {
histogram.push((last_fee_rate, bin_size));
}
histogram
}
#[cfg(test)]
mod tests {
#[test]
fn test_fakestore() {
use crate::daemon::MempoolEntry;
use crate::mempool::electrum_fees;
let entries = [
// (fee: u64, vsize: u32)
&MempoolEntry::new(1_000, 1_000),
&MempoolEntry::new(10_000, 10_000),
&MempoolEntry::new(50_000, 50_000),
&MempoolEntry::new(120_000, 60_000),
&MempoolEntry::new(210_000, 70_000),
&MempoolEntry::new(320_000, 80_000),
];
assert_eq!(
electrum_fees(&entries[..]),
vec![(3.0, 150_000), (1.0, 121_000)]
);
}
}