diff --git a/units/src/amount/signed.rs b/units/src/amount/signed.rs index 266a5d32a..77a36931a 100644 --- a/units/src/amount/signed.rs +++ b/units/src/amount/signed.rs @@ -457,6 +457,16 @@ impl core::iter::Sum for SignedAmount { } } +impl<'a> core::iter::Sum<&'a SignedAmount> for SignedAmount { + fn sum(iter: I) -> Self + where + I: Iterator, + { + let sats: i64 = iter.map(|amt| amt.0).sum(); + SignedAmount::from_sat(sats) + } +} + #[cfg(feature = "arbitrary")] impl<'a> Arbitrary<'a> for SignedAmount { fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result { diff --git a/units/src/amount/tests.rs b/units/src/amount/tests.rs index e695a443b..00d54d726 100644 --- a/units/src/amount/tests.rs +++ b/units/src/amount/tests.rs @@ -825,8 +825,8 @@ fn serde_as_sat_opt() { #[test] fn sum_amounts() { - assert_eq!(Amount::from_sat(0), [].into_iter().sum::()); - assert_eq!(SignedAmount::from_sat(0), [].into_iter().sum::()); + assert_eq!(Amount::from_sat(0), [].iter().sum::()); + assert_eq!(SignedAmount::from_sat(0), [].iter().sum::()); let amounts = [Amount::from_sat(42), Amount::from_sat(1337), Amount::from_sat(21)]; let sum = amounts.into_iter().sum::(); diff --git a/units/src/amount/unsigned.rs b/units/src/amount/unsigned.rs index c2e6de9a9..99af7f70f 100644 --- a/units/src/amount/unsigned.rs +++ b/units/src/amount/unsigned.rs @@ -444,6 +444,16 @@ impl core::iter::Sum for Amount { } } +impl<'a> core::iter::Sum<&'a Amount> for Amount { + fn sum(iter: I) -> Self + where + I: Iterator, + { + let sats: u64 = iter.map(|amt| amt.0).sum(); + Amount::from_sat(sats) + } +} + #[cfg(feature = "arbitrary")] impl<'a> Arbitrary<'a> for Amount { fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result { diff --git a/units/src/block.rs b/units/src/block.rs index 7b407e33c..aabb4c2cc 100644 --- a/units/src/block.rs +++ b/units/src/block.rs @@ -231,6 +231,23 @@ impl ops::SubAssign for BlockInterval { fn sub_assign(&mut self, rhs: BlockInterval) { self.0 = self.to_u32() - rhs.to_u32(); } } +impl core::iter::Sum for BlockInterval { + fn sum>(iter: I) -> Self { + let sum = iter.map(|interval| interval.0).sum(); + BlockInterval::from_u32(sum) + } +} + +impl<'a> core::iter::Sum<&'a BlockInterval> for BlockInterval { + fn sum(iter: I) -> Self + where + I: Iterator, + { + let sum = iter.map(|interval| interval.0).sum(); + BlockInterval::from_u32(sum) + } +} + #[cfg(test)] mod tests { use super::*; diff --git a/units/src/fee_rate.rs b/units/src/fee_rate.rs index 4ed19f685..c6f3f76fb 100644 --- a/units/src/fee_rate.rs +++ b/units/src/fee_rate.rs @@ -267,6 +267,24 @@ impl SubAssign<&FeeRate> for FeeRate { fn sub_assign(&mut self, rhs: &FeeRate) { self.0 -= rhs.0 } } +impl core::iter::Sum for FeeRate { + fn sum(iter: I) -> Self + where + I: Iterator, + { + FeeRate::from_sat_per_kwu(iter.map(FeeRate::to_sat_per_kwu).sum()) + } +} + +impl<'a> core::iter::Sum<&'a FeeRate> for FeeRate { + fn sum(iter: I) -> Self + where + I: Iterator, + { + FeeRate::from_sat_per_kwu(iter.map(|f| FeeRate::to_sat_per_kwu(*f)).sum()) + } +} + crate::impl_parse_str_from_int_infallible!(FeeRate, u64, from_sat_per_kwu); #[cfg(test)]