Merge rust-bitcoin/rust-bitcoin#3889: Reorder assertions in units::amount::tests to follow got, want order

7a3df57659 Reorder assertions in units::amount::tests to follow got, want order (yhzlsm)

Pull request description:

  Reorder assertions in `units::amount::tests` to follow got, want order.

  Makes debugging easier, as there's no need to check the test to verify the order.

  Close #3860

ACKs for top commit:
  tcharding:
    ACK 7a3df57659
  apoelstra:
    ACK 7a3df57659d02ab610e328072435836386ed1c97; successfully ran local tests

Tree-SHA512: 7d07162ba930ca1471684a771cad08ba9153b0b38bf44c98fd41c2d70f05c36b95f022dd82e61e6b50614266f16a5615edd79d6d548b003642509866416021c9
This commit is contained in:
merge-script 2025-01-09 22:34:20 +00:00
commit 57469bf041
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 11 additions and 11 deletions

View File

@ -939,16 +939,16 @@ fn sum_amounts() {
let sat = Amount::from_sat;
let ssat = SignedAmount::from_sat;
assert_eq!(Amount::ZERO, [].iter().sum::<Amount>());
assert_eq!(SignedAmount::ZERO, [].iter().sum::<SignedAmount>());
assert_eq!([].iter().sum::<Amount>(), Amount::ZERO);
assert_eq!([].iter().sum::<SignedAmount>(), SignedAmount::ZERO);
let amounts = [sat(42), sat(1337), sat(21)];
let sum = amounts.into_iter().sum::<Amount>();
assert_eq!(sat(1400), sum);
assert_eq!(sum, sat(1400));
let amounts = [ssat(-42), ssat(1337), ssat(21)];
let sum = amounts.into_iter().sum::<SignedAmount>();
assert_eq!(ssat(1316), sum);
assert_eq!(sum, ssat(1316));
}
#[test]
@ -956,28 +956,28 @@ fn checked_sum_amounts() {
let sat = Amount::from_sat;
let ssat = SignedAmount::from_sat;
assert_eq!(Some(Amount::ZERO), [].into_iter().checked_sum());
assert_eq!(Some(SignedAmount::ZERO), [].into_iter().checked_sum());
assert_eq!([].into_iter().checked_sum(), Some(Amount::ZERO));
assert_eq!([].into_iter().checked_sum(), Some(SignedAmount::ZERO));
let amounts = [sat(42), sat(1337), sat(21)];
let sum = amounts.into_iter().checked_sum();
assert_eq!(Some(sat(1400)), sum);
assert_eq!(sum, Some(sat(1400)));
let amounts = [sat(u64::MAX), sat(1337), sat(21)];
let sum = amounts.into_iter().checked_sum();
assert_eq!(None, sum);
assert_eq!(sum, None);
let amounts = [SignedAmount::MIN, ssat(-1), ssat(21)];
let sum = amounts.into_iter().checked_sum();
assert_eq!(None, sum);
assert_eq!(sum, None);
let amounts = [SignedAmount::MAX, ssat(1), ssat(21)];
let sum = amounts.into_iter().checked_sum();
assert_eq!(None, sum);
assert_eq!(sum, None);
let amounts = [ssat(42), ssat(3301), ssat(21)];
let sum = amounts.into_iter().checked_sum();
assert_eq!(Some(ssat(3364)), sum);
assert_eq!(sum, Some(ssat(3364)));
}
#[test]