From af98b8da063b72d20f26ae210ad18108ffbe0471 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Thu, 8 Apr 2021 12:12:51 -0700 Subject: [PATCH] Compare float equality using error margin EPSILON, clippy warning https://rust-lang.github.io/rust-clippy/master/index.html#float_cmp --- src/wallet/coin_selection.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/wallet/coin_selection.rs b/src/wallet/coin_selection.rs index 47ef2d99..5653662d 100644 --- a/src/wallet/coin_selection.rs +++ b/src/wallet/coin_selection.rs @@ -654,7 +654,7 @@ mod test { assert_eq!(result.selected.len(), 3); assert_eq!(result.selected_amount(), 300_010); - assert_eq!(result.fee_amount, 254.0); + assert!((result.fee_amount - 254.0).abs() < f32::EPSILON); } #[test] @@ -675,7 +675,7 @@ mod test { assert_eq!(result.selected.len(), 3); assert_eq!(result.selected_amount(), 300_010); - assert_eq!(result.fee_amount, 254.0); + assert!((result.fee_amount - 254.0).abs() < f32::EPSILON); } #[test] @@ -696,7 +696,7 @@ mod test { assert_eq!(result.selected.len(), 1); assert_eq!(result.selected_amount(), 200_000); - assert_eq!(result.fee_amount, 118.0); + assert!((result.fee_amount - 118.0).abs() < f32::EPSILON); } #[test] @@ -756,7 +756,7 @@ mod test { assert_eq!(result.selected.len(), 3); assert_eq!(result.selected_amount(), 300_000); - assert_eq!(result.fee_amount, 254.0); + assert!((result.fee_amount - 254.0).abs() < f32::EPSILON); } #[test] @@ -777,7 +777,7 @@ mod test { assert_eq!(result.selected.len(), 3); assert_eq!(result.selected_amount(), 300_010); - assert_eq!(result.fee_amount, 254.0); + assert!((result.fee_amount - 254.0).abs() < f32::EPSILON); } #[test] @@ -798,7 +798,7 @@ mod test { assert_eq!(result.selected.len(), 3); assert_eq!(result.selected_amount(), 300010); - assert_eq!(result.fee_amount, 254.0); + assert!((result.fee_amount - 254.0).abs() < f32::EPSILON); } #[test] @@ -968,7 +968,7 @@ mod test { cost_of_change, ) .unwrap(); - assert_eq!(result.fee_amount, 186.0); + assert!((result.fee_amount - 186.0).abs() < f32::EPSILON); assert_eq!(result.selected_amount(), 100_000); } @@ -1031,9 +1031,8 @@ mod test { ); assert!(result.selected_amount() > target_amount); - assert_eq!( - result.fee_amount, - 50.0 + result.selected.len() as f32 * 68.0 + assert!( + (result.fee_amount - (50.0 + result.selected.len() as f32 * 68.0)).abs() < f32::EPSILON ); } }