Skip to content

Don't return 1.0 feerate if none is found by convert_fee_rate #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Don't return 1.0 feerate if none is found by convert_fee_rate #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed219e2
fix: don't return default 1.0 feerate if not found by `convert_fee_rate`
ValuedMammal Jun 22, 2024
ec5ee82
test: improve test `feerate_parsing`
ValuedMammal Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,14 @@ pub use r#async::AsyncClient;

/// Get a fee value in sats/vbytes from the estimates
/// that matches the confirmation target set as parameter.
pub fn convert_fee_rate(target: usize, estimates: HashMap<u16, f64>) -> Result<f32, Error> {
let fee_val = {
let mut pairs = estimates.into_iter().collect::<Vec<(u16, f64)>>();
pairs.sort_unstable_by_key(|(k, _)| std::cmp::Reverse(*k));
pairs
.into_iter()
.find(|(k, _)| *k as usize <= target)
.map(|(_, v)| v)
.unwrap_or(1.0)
};
Ok(fee_val as f32)
///
/// Returns `None` if no feerate estimate is found at or below `target` confirmations.
pub fn convert_fee_rate(target: usize, estimates: HashMap<u16, f64>) -> Option<f32> {
estimates
.into_iter()
.filter(|(k, _)| *k as usize <= target)
.max_by_key(|(k, _)| *k)
.map(|(_, v)| v as f32)
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -391,12 +388,17 @@ mod test {
"#,
)
.unwrap();
assert!(convert_fee_rate(1, HashMap::new()).is_none());
assert_eq!(convert_fee_rate(6, esplora_fees.clone()).unwrap(), 2.236);
assert_eq!(
convert_fee_rate(26, esplora_fees).unwrap(),
convert_fee_rate(26, esplora_fees.clone()).unwrap(),
1.015,
"should inherit from value for 25"
);
assert!(
convert_fee_rate(0, esplora_fees).is_none(),
"should not return feerate for 0 target"
);
}

#[cfg(all(feature = "blocking", feature = "async"))]
Expand Down