Informational 15 Bitcoin Committed Aug 6, 2025 · 06:07 UTC
units: Make result module public

99d0a4a7 View source ↗
Public commit record
What the developer wrote

Authored by Tobin C. Harding
68/100 · Adequate
units: Make result module public

The `result` module provides three types, two of which are quite
low-level and do not appear directly in any APIs.

In the spirit of the new re-export policy the two minor types probably
should not be re-exported at the crate root. To implement this we need
to make the module public.
✓ Descriptive subject✓ Names a concrete action or component✓ Provides detailed explanatory context
The short version
What changed, and why it matters

This commit is a routine library reorganization: it moves some error/result helper types into a newly public `result` submodule and removes their old re-exports from the crate root. There is no change to how calculations are performed, no bug fix, and no security-sensitive behavior is introduced.
Recommended action
No security action required. Treat as a normal semver-aware API change; downstream users may need to update imports from `bitcoin_units::NumOpResult` to `bitcoin_units::result::NumOpResult` if the root re-export is removed.
Security signals we found

No strong security signals were identified.
Technical analysis
Evidence from the diff

The patch makes bitcoin_units::result a public module and relocates MathOp, NumOpError, and NumOpResult<T> from bitcoin_units::* root re-exports to bitcoin_units::result::*. The diff is dominated by API-snapshot text files (api/units/*.txt) mechanically reflecting the new paths. Source changes update pub use statements and adjust internal references in units/src/lib.rs, units/src/amount/result.rs, units/src/amount/unsigned.rs, units/src/fee_rate/mod.rs, and tests. No logic, bounds checking, or arithmetic implementation changed.
Changed components

bitcoin_units crate public API surfaceunits/src/lib.rsunits/src/result.rsunits/src/amount/result.rsunits/src/amount/unsigned.rsunits/src/fee_rate/mod.rs
Inspect captured patch +1289 / −1275
diff --git a/api/units/all-features.txt b/api/units/all-features.txt
index eef11f0c..7ae200ee 100644
--- a/api/units/all-features.txt
+++ b/api/units/all-features.txt
@@ -1,7 +1,6 @@
-#[non_exhaustive] pub enum bitcoin_units::MathOp
 #[non_exhaustive] pub enum bitcoin_units::amount::Denomination
 #[non_exhaustive] pub enum bitcoin_units::amount::ParseDenominationError
-#[non_exhaustive] pub struct bitcoin_units::NumOpError(_)
+#[non_exhaustive] pub enum bitcoin_units::result::MathOp
 #[non_exhaustive] pub struct bitcoin_units::absolute::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::absolute::error::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::amount::MissingDenominationError
@@ -11,11 +10,10 @@
 #[non_exhaustive] pub struct bitcoin_units::locktime::absolute::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::locktime::absolute::error::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::parse::ParseIntError
+#[non_exhaustive] pub struct bitcoin_units::result::NumOpError(_)
 impl bitcoin_units::Amount
 impl bitcoin_units::BlockTime
 impl bitcoin_units::FeeRate
-impl bitcoin_units::MathOp
-impl bitcoin_units::NumOpError
 impl bitcoin_units::SignedAmount
 impl bitcoin_units::Weight
 impl bitcoin_units::amount::Denomination
@@ -44,12 +42,12 @@ impl bitcoin_units::parse::Integer for u16
 impl bitcoin_units::parse::Integer for u32
 impl bitcoin_units::parse::Integer for u64
 impl bitcoin_units::parse::Integer for u8
+impl bitcoin_units::result::MathOp
+impl bitcoin_units::result::NumOpError
 impl bitcoin_units::sequence::Sequence
 impl core::clone::Clone for bitcoin_units::Amount
 impl core::clone::Clone for bitcoin_units::BlockTime
 impl core::clone::Clone for bitcoin_units::FeeRate
-impl core::clone::Clone for bitcoin_units::MathOp
-impl core::clone::Clone for bitcoin_units::NumOpError
 impl core::clone::Clone for bitcoin_units::SignedAmount
 impl core::clone::Clone for bitcoin_units::Weight
 impl core::clone::Clone for bitcoin_units::amount::Denomination
@@ -92,12 +90,12 @@ impl core::clone::Clone for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::clone::Clone for bitcoin_units::parse::ParseIntError
 impl core::clone::Clone for bitcoin_units::parse::PrefixedHexError
 impl core::clone::Clone for bitcoin_units::parse::UnprefixedHexError
+impl core::clone::Clone for bitcoin_units::result::MathOp
+impl core::clone::Clone for bitcoin_units::result::NumOpError
 impl core::clone::Clone for bitcoin_units::sequence::Sequence
 impl core::cmp::Eq for bitcoin_units::Amount
 impl core::cmp::Eq for bitcoin_units::BlockTime
 impl core::cmp::Eq for bitcoin_units::FeeRate
-impl core::cmp::Eq for bitcoin_units::MathOp
-impl core::cmp::Eq for bitcoin_units::NumOpError
 impl core::cmp::Eq for bitcoin_units::SignedAmount
 impl core::cmp::Eq for bitcoin_units::Weight
 impl core::cmp::Eq for bitcoin_units::amount::Denomination
@@ -139,6 +137,8 @@ impl core::cmp::Eq for bitcoin_units::locktime::relative::error::TimeOverflowErr
 impl core::cmp::Eq for bitcoin_units::parse::ParseIntError
 impl core::cmp::Eq for bitcoin_units::parse::PrefixedHexError
 impl core::cmp::Eq for bitcoin_units::parse::UnprefixedHexError
+impl core::cmp::Eq for bitcoin_units::result::MathOp
+impl core::cmp::Eq for bitcoin_units::result::NumOpError
 impl core::cmp::Eq for bitcoin_units::sequence::Sequence
 impl core::cmp::Ord for bitcoin_units::Amount
 impl core::cmp::Ord for bitcoin_units::BlockTime
@@ -157,8 +157,6 @@ impl core::cmp::Ord for bitcoin_units::sequence::Sequence
 impl core::cmp::PartialEq for bitcoin_units::Amount
 impl core::cmp::PartialEq for bitcoin_units::BlockTime
 impl core::cmp::PartialEq for bitcoin_units::FeeRate
-impl core::cmp::PartialEq for bitcoin_units::MathOp
-impl core::cmp::PartialEq for bitcoin_units::NumOpError
 impl core::cmp::PartialEq for bitcoin_units::SignedAmount
 impl core::cmp::PartialEq for bitcoin_units::Weight
 impl core::cmp::PartialEq for bitcoin_units::amount::Denomination
@@ -200,6 +198,8 @@ impl core::cmp::PartialEq for bitcoin_units::locktime::relative::error::TimeOver
 impl core::cmp::PartialEq for bitcoin_units::parse::ParseIntError
 impl core::cmp::PartialEq for bitcoin_units::parse::PrefixedHexError
 impl core::cmp::PartialEq for bitcoin_units::parse::UnprefixedHexError
+impl core::cmp::PartialEq for bitcoin_units::result::MathOp
+impl core::cmp::PartialEq for bitcoin_units::result::NumOpError
 impl core::cmp::PartialEq for bitcoin_units::sequence::Sequence
 impl core::cmp::PartialOrd for bitcoin_units::Amount
 impl core::cmp::PartialOrd for bitcoin_units::BlockTime
@@ -216,12 +216,12 @@ impl core::cmp::PartialOrd for bitcoin_units::locktime::relative::NumberOf512Sec
 impl core::cmp::PartialOrd for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::cmp::PartialOrd for bitcoin_units::sequence::Sequence
 impl core::convert::AsRef<core::num::error::ParseIntError> for bitcoin_units::parse::ParseIntError
-impl core::convert::From<&bitcoin_units::Amount> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::convert::From<&bitcoin_units::SignedAmount> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::convert::From<&bitcoin_units::Amount> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::convert::From<&bitcoin_units::SignedAmount> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::SignedAmount
+impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::convert::From<bitcoin_units::BlockTime> for u32
-impl core::convert::From<bitcoin_units::SignedAmount> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::convert::From<bitcoin_units::SignedAmount> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::convert::From<bitcoin_units::Weight> for u64
 impl core::convert::From<bitcoin_units::amount::InputTooLargeError> for bitcoin_units::amount::ParseAmountError
 impl core::convert::From<bitcoin_units::amount::InputTooLargeError> for bitcoin_units::amount::ParseError
@@ -309,7 +309,6 @@ impl core::default::Default for bitcoin_units::block::BlockMtpInterval
 impl core::default::Default for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::default::Default for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::default::Default for bitcoin_units::sequence::Sequence
-impl core::error::Error for bitcoin_units::NumOpError
 impl core::error::Error for bitcoin_units::amount::InputTooLargeError
 impl core::error::Error for bitcoin_units::amount::InvalidCharacterError
 impl core::error::Error for bitcoin_units::amount::MissingDigitsError
@@ -337,11 +336,10 @@ impl core::error::Error for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::error::Error for bitcoin_units::parse::ParseIntError
 impl core::error::Error for bitcoin_units::parse::PrefixedHexError
 impl core::error::Error for bitcoin_units::parse::UnprefixedHexError
+impl core::error::Error for bitcoin_units::result::NumOpError
 impl core::fmt::Debug for bitcoin_units::Amount
 impl core::fmt::Debug for bitcoin_units::BlockTime
 impl core::fmt::Debug for bitcoin_units::FeeRate
-impl core::fmt::Debug for bitcoin_units::MathOp
-impl core::fmt::Debug for bitcoin_units::NumOpError
 impl core::fmt::Debug for bitcoin_units::SignedAmount
 impl core::fmt::Debug for bitcoin_units::Weight
 impl core::fmt::Debug for bitcoin_units::amount::Denomination
@@ -384,10 +382,10 @@ impl core::fmt::Debug for bitcoin_units::locktime::relative::error::TimeOverflow
 impl core::fmt::Debug for bitcoin_units::parse::ParseIntError
 impl core::fmt::Debug for bitcoin_units::parse::PrefixedHexError
 impl core::fmt::Debug for bitcoin_units::parse::UnprefixedHexError
+impl core::fmt::Debug for bitcoin_units::result::MathOp
+impl core::fmt::Debug for bitcoin_units::result::NumOpError
 impl core::fmt::Debug for bitcoin_units::sequence::Sequence
 impl core::fmt::Display for bitcoin_units::Amount
-impl core::fmt::Display for bitcoin_units::MathOp
-impl core::fmt::Display for bitcoin_units::NumOpError
 impl core::fmt::Display for bitcoin_units::SignedAmount
 impl core::fmt::Display for bitcoin_units::Weight
 impl core::fmt::Display for bitcoin_units::amount::Denomination
@@ -429,6 +427,8 @@ impl core::fmt::Display for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::fmt::Display for bitcoin_units::parse::ParseIntError
 impl core::fmt::Display for bitcoin_units::parse::PrefixedHexError
 impl core::fmt::Display for bitcoin_units::parse::UnprefixedHexError
+impl core::fmt::Display for bitcoin_units::result::MathOp
+impl core::fmt::Display for bitcoin_units::result::NumOpError
 impl core::fmt::Display for bitcoin_units::sequence::Sequence
 impl core::fmt::LowerHex for bitcoin_units::sequence::Sequence
 impl core::fmt::UpperHex for bitcoin_units::sequence::Sequence
@@ -450,16 +450,14 @@ impl core::hash::Hash for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::hash::Hash for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::hash::Hash for bitcoin_units::sequence::Sequence
 impl core::iter::traits::accum::Sum for bitcoin_units::FeeRate
-impl core::iter::traits::accum::Sum for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::iter::traits::accum::Sum for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::iter::traits::accum::Sum for bitcoin_units::Weight
 impl core::iter::traits::accum::Sum for bitcoin_units::block::BlockHeightInterval
 impl core::iter::traits::accum::Sum for bitcoin_units::block::BlockMtpInterval
+impl core::iter::traits::accum::Sum for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::iter::traits::accum::Sum for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::marker::Copy for bitcoin_units::Amount
 impl core::marker::Copy for bitcoin_units::BlockTime
 impl core::marker::Copy for bitcoin_units::FeeRate
-impl core::marker::Copy for bitcoin_units::MathOp
-impl core::marker::Copy for bitcoin_units::NumOpError
 impl core::marker::Copy for bitcoin_units::SignedAmount
 impl core::marker::Copy for bitcoin_units::Weight
 impl core::marker::Copy for bitcoin_units::amount::Denomination
@@ -474,12 +472,12 @@ impl core::marker::Copy for bitcoin_units::locktime::absolute::MedianTimePast
 impl core::marker::Copy for bitcoin_units::locktime::relative::LockTime
 impl core::marker::Copy for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::marker::Copy for bitcoin_units::locktime::relative::NumberOfBlocks
+impl core::marker::Copy for bitcoin_units::result::MathOp
+impl core::marker::Copy for bitcoin_units::result::NumOpError
 impl core::marker::Copy for bitcoin_units::sequence::Sequence
 impl core::marker::Freeze for bitcoin_units::Amount
 impl core::marker::Freeze for bitcoin_units::BlockTime
 impl core::marker::Freeze for bitcoin_units::FeeRate
-impl core::marker::Freeze for bitcoin_units::MathOp
-impl core::marker::Freeze for bitcoin_units::NumOpError
 impl core::marker::Freeze for bitcoin_units::SignedAmount
 impl core::marker::Freeze for bitcoin_units::Weight
 impl core::marker::Freeze for bitcoin_units::amount::Denomination
@@ -522,12 +520,12 @@ impl core::marker::Freeze for bitcoin_units::locktime::relative::error::TimeOver
 impl core::marker::Freeze for bitcoin_units::parse::ParseIntError
 impl core::marker::Freeze for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Freeze for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Freeze for bitcoin_units::result::MathOp
+impl core::marker::Freeze for bitcoin_units::result::NumOpError
 impl core::marker::Freeze for bitcoin_units::sequence::Sequence
 impl core::marker::Send for bitcoin_units::Amount
 impl core::marker::Send for bitcoin_units::BlockTime
 impl core::marker::Send for bitcoin_units::FeeRate
-impl core::marker::Send for bitcoin_units::MathOp
-impl core::marker::Send for bitcoin_units::NumOpError
 impl core::marker::Send for bitcoin_units::SignedAmount
 impl core::marker::Send for bitcoin_units::Weight
 impl core::marker::Send for bitcoin_units::amount::Denomination
@@ -570,12 +568,12 @@ impl core::marker::Send for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::marker::Send for bitcoin_units::parse::ParseIntError
 impl core::marker::Send for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Send for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Send for bitcoin_units::result::MathOp
+impl core::marker::Send for bitcoin_units::result::NumOpError
 impl core::marker::Send for bitcoin_units::sequence::Sequence
 impl core::marker::StructuralPartialEq for bitcoin_units::Amount
 impl core::marker::StructuralPartialEq for bitcoin_units::BlockTime
 impl core::marker::StructuralPartialEq for bitcoin_units::FeeRate
-impl core::marker::StructuralPartialEq for bitcoin_units::MathOp
-impl core::marker::StructuralPartialEq for bitcoin_units::NumOpError
 impl core::marker::StructuralPartialEq for bitcoin_units::SignedAmount
 impl core::marker::StructuralPartialEq for bitcoin_units::Weight
 impl core::marker::StructuralPartialEq for bitcoin_units::amount::Denomination
@@ -617,12 +615,12 @@ impl core::marker::StructuralPartialEq for bitcoin_units::locktime::relative::er
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::ParseIntError
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::PrefixedHexError
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::StructuralPartialEq for bitcoin_units::result::MathOp
+impl core::marker::StructuralPartialEq for bitcoin_units::result::NumOpError
 impl core::marker::StructuralPartialEq for bitcoin_units::sequence::Sequence
 impl core::marker::Sync for bitcoin_units::Amount
 impl core::marker::Sync for bitcoin_units::BlockTime
 impl core::marker::Sync for bitcoin_units::FeeRate
-impl core::marker::Sync for bitcoin_units::MathOp
-impl core::marker::Sync for bitcoin_units::NumOpError
 impl core::marker::Sync for bitcoin_units::SignedAmount
 impl core::marker::Sync for bitcoin_units::Weight
 impl core::marker::Sync for bitcoin_units::amount::Denomination
@@ -665,12 +663,12 @@ impl core::marker::Sync for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::marker::Sync for bitcoin_units::parse::ParseIntError
 impl core::marker::Sync for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Sync for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Sync for bitcoin_units::result::MathOp
+impl core::marker::Sync for bitcoin_units::result::NumOpError
 impl core::marker::Sync for bitcoin_units::sequence::Sequence
 impl core::marker::Unpin for bitcoin_units::Amount
 impl core::marker::Unpin for bitcoin_units::BlockTime
 impl core::marker::Unpin for bitcoin_units::FeeRate
-impl core::marker::Unpin for bitcoin_units::MathOp
-impl core::marker::Unpin for bitcoin_units::NumOpError
 impl core::marker::Unpin for bitcoin_units::SignedAmount
 impl core::marker::Unpin for bitcoin_units::Weight
 impl core::marker::Unpin for bitcoin_units::amount::Denomination
@@ -713,6 +711,8 @@ impl core::marker::Unpin for bitcoin_units::locktime::relative::error::TimeOverf
 impl core::marker::Unpin for bitcoin_units::parse::ParseIntError
 impl core::marker::Unpin for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Unpin for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Unpin for bitcoin_units::result::MathOp
+impl core::marker::Unpin for bitcoin_units::result::NumOpError
 impl core::marker::Unpin for bitcoin_units::sequence::Sequence
 impl core::ops::arith::Add for bitcoin_units::Amount
 impl core::ops::arith::Add for bitcoin_units::FeeRate
@@ -722,20 +722,16 @@ impl core::ops::arith::Add for bitcoin_units::block::BlockHeightInterval
 impl core::ops::arith::Add for bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Add<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Add<&bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl core::ops::arith::Add<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Add<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<&bitcoin_units::Weight> for bitcoin_units::Weight
 impl core::ops::arith::Add<&bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeight
 impl core::ops::arith::Add<&bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeightInterval
 impl core::ops::arith::Add<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Add<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl core::ops::arith::Add<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Add<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Add<bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::Weight> for &bitcoin_units::Weight
 impl core::ops::arith::Add<bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeight
@@ -744,6 +740,10 @@ impl core::ops::arith::Add<bitcoin_units::block::BlockHeightInterval> for bitcoi
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::AddAssign for bitcoin_units::FeeRate
 impl core::ops::arith::AddAssign for bitcoin_units::Weight
 impl core::ops::arith::AddAssign for bitcoin_units::block::BlockHeightInterval
@@ -757,43 +757,43 @@ impl core::ops::arith::Div for bitcoin_units::SignedAmount
 impl core::ops::arith::Div for bitcoin_units::Weight
 impl core::ops::arith::Div<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::Weight
+impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<i64>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::Amount
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::FeeRate
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::Weight
-impl core::ops::arith::Div<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Div<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Div<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Div<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::Weight
+impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<core::num::nonzero::NonZero<i64>> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<i64>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for &bitcoin_units::Amount
@@ -802,99 +802,99 @@ impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for &bitcoin_units:
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::Amount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::FeeRate
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::Weight
-impl core::ops::arith::Div<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Div<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Div<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Div<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Div<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Div<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for bitcoin_units::Amount
-impl core::ops::arith::Div<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for bitcoin_units::Weight
-impl core::ops::arith::DivAssign<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::DivAssign<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::DivAssign<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::DivAssign<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::DivAssign<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::DivAssign<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::DivAssign<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::DivAssign<u64> for bitcoin_units::Weight
+impl core::ops::arith::DivAssign<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<&bitcoin_units::Amount> for u64
-impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::Weight
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for u64
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for i64
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<&bitcoin_units::SignedAmount> for i64
 impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<&bitcoin_units::Weight> for u64
-impl core::ops::arith::Mul<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for u64
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for i64
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Mul<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Mul<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Mul<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<bitcoin_units::Amount> for &u64
 impl core::ops::arith::Mul<bitcoin_units::Amount> for u64
-impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &u64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for u64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &i64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for i64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::SignedAmount> for &i64
 impl core::ops::arith::Mul<bitcoin_units::SignedAmount> for i64
 impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<bitcoin_units::Weight> for &u64
 impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<bitcoin_units::Weight> for u64
-impl core::ops::arith::Mul<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &u64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for u64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &i64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for i64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Mul<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Mul<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Mul<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Mul<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for bitcoin_units::Amount
-impl core::ops::arith::Mul<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for bitcoin_units::Weight
-impl core::ops::arith::MulAssign<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::MulAssign<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::MulAssign<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::MulAssign<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Mul<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::MulAssign<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::MulAssign<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::MulAssign<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::MulAssign<u64> for bitcoin_units::Weight
+impl core::ops::arith::MulAssign<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Neg for bitcoin_units::SignedAmount
 impl core::ops::arith::Rem for bitcoin_units::Weight
 impl core::ops::arith::Rem<&bitcoin_units::Weight> for bitcoin_units::Weight
-impl core::ops::arith::Rem<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Rem<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Rem<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Rem<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<bitcoin_units::Weight> for &bitcoin_units::Weight
-impl core::ops::arith::Rem<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Rem<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Rem<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Rem<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Rem<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Rem<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for bitcoin_units::Amount
-impl core::ops::arith::Rem<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for bitcoin_units::Weight
+impl core::ops::arith::Rem<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::RemAssign<u64> for bitcoin_units::Weight
 impl core::ops::arith::Sub for bitcoin_units::Amount
 impl core::ops::arith::Sub for bitcoin_units::FeeRate
@@ -906,8 +906,6 @@ impl core::ops::arith::Sub for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub for bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Sub<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Sub<&bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl core::ops::arith::Sub<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Sub<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<&bitcoin_units::Weight> for bitcoin_units::Weight
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockHeight> for bitcoin_units::block::BlockHeight
@@ -916,12 +914,10 @@ impl core::ops::arith::Sub<&bitcoin_units::block::BlockHeightInterval> for bitco
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtp> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Sub<bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::Weight> for &bitcoin_units::Weight
 impl core::ops::arith::Sub<bitcoin_units::block::BlockHeight> for &bitcoin_units::block::BlockHeight
@@ -932,6 +928,10 @@ impl core::ops::arith::Sub<bitcoin_units::block::BlockMtp> for &bitcoin_units::b
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::SubAssign for bitcoin_units::FeeRate
 impl core::ops::arith::SubAssign for bitcoin_units::Weight
 impl core::ops::arith::SubAssign for bitcoin_units::block::BlockHeightInterval
@@ -943,8 +943,6 @@ impl core::ops::arith::SubAssign<&bitcoin_units::block::BlockMtpInterval> for bi
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::Amount
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::BlockTime
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::FeeRate
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::MathOp
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::NumOpError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::SignedAmount
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::Weight
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::amount::Denomination
@@ -987,12 +985,12 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::locktime::relati
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::ParseIntError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::PrefixedHexError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::UnprefixedHexError
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::MathOp
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::NumOpError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::sequence::Sequence
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::Amount
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::BlockTime
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::FeeRate
-impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::MathOp
-impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::NumOpError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::SignedAmount
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::Weight
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::amount::Denomination
@@ -1035,6 +1033,8 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::locktime::relative:
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::ParseIntError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::PrefixedHexError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::UnprefixedHexError
+impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::MathOp
+impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::NumOpError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::sequence::Sequence
 impl core::str::traits::FromStr for bitcoin_units::Amount
 impl core::str::traits::FromStr for bitcoin_units::SignedAmount
@@ -1059,15 +1059,14 @@ impl serde::ser::Serialize for bitcoin_units::block::BlockMtpInterval
 impl serde::ser::Serialize for bitcoin_units::locktime::absolute::LockTime
 impl serde::ser::Serialize for bitcoin_units::locktime::relative::LockTime
 impl serde::ser::Serialize for bitcoin_units::sequence::Sequence
-impl<'a, T: arbitrary::Arbitrary<'a>> arbitrary::Arbitrary<'a> for bitcoin_units::NumOpResult<T>
-impl<'a, T> core::ops::arith::Add<&'a T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Sub<&'a T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
+impl<'a, T: arbitrary::Arbitrary<'a>> arbitrary::Arbitrary<'a> for bitcoin_units::result::NumOpResult<T>
+impl<'a, T> core::ops::arith::Add<&'a T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Sub<&'a T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::Amount
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::BlockTime
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::FeeRate
-impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::MathOp
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::SignedAmount
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::Weight
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::amount::Denomination
@@ -1080,71 +1079,70 @@ impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::locktime::absolute::LockTim
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::locktime::absolute::MedianTimePast
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::locktime::relative::NumberOfBlocks
+impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::result::MathOp
 impl<'a> arbitrary::Arbitrary<'a> for bitcoin_units::sequence::Sequence
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::Weight> for bitcoin_units::Weight
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeightInterval
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeight
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeightInterval
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
+impl<'a> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<i64>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::FeeRate
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Amount> for &u64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &u64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &i64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::SignedAmount> for &i64
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &u64
-impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &u64
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &i64
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Rem<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockHeight> for &bitcoin_units::block::BlockHeight
@@ -1153,6 +1151,8 @@ impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockHeightInterval> fo
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtp> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
+impl<'a> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::BlockTime
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::Weight
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::block::BlockHeight
@@ -1162,39 +1162,33 @@ impl<'de> serde::de::Deserialize<'de> for bitcoin_units::block::BlockMtpInterval
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::locktime::absolute::LockTime
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::locktime::relative::LockTime
 impl<'de> serde::de::Deserialize<'de> for bitcoin_units::sequence::Sequence
-impl<T: core::clone::Clone> core::clone::Clone for bitcoin_units::NumOpResult<T>
-impl<T: core::cmp::Eq> core::cmp::Eq for bitcoin_units::NumOpResult<T>
-impl<T: core::cmp::PartialEq> core::cmp::PartialEq for bitcoin_units::NumOpResult<T>
-impl<T: core::fmt::Debug> bitcoin_units::NumOpResult<T>
-impl<T: core::fmt::Debug> core::fmt::Debug for bitcoin_units::NumOpResult<T>
-impl<T: core::marker::Copy> core::marker::Copy for bitcoin_units::NumOpResult<T>
-impl<T> bitcoin_units::NumOpResult<T>
-impl<T> core::marker::Freeze for bitcoin_units::NumOpResult<T> where T: core::marker::Freeze
-impl<T> core::marker::Send for bitcoin_units::NumOpResult<T> where T: core::marker::Send
-impl<T> core::marker::StructuralPartialEq for bitcoin_units::NumOpResult<T>
-impl<T> core::marker::Sync for bitcoin_units::NumOpResult<T> where T: core::marker::Sync
-impl<T> core::marker::Unpin for bitcoin_units::NumOpResult<T> where T: core::marker::Unpin
-impl<T> core::ops::arith::Add for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<&T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<&bitcoin_units::NumOpResult<T>> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<&T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<&bitcoin_units::NumOpResult<T>> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::NumOpResult<T> where T: core::panic::unwind_safe::RefUnwindSafe
-impl<T> core::panic::unwind_safe::UnwindSafe for bitcoin_units::NumOpResult<T> where T: core::panic::unwind_safe::UnwindSafe
-pub bitcoin_units::MathOp::Add
-pub bitcoin_units::MathOp::Div
-pub bitcoin_units::MathOp::Mul
-pub bitcoin_units::MathOp::Neg
-pub bitcoin_units::MathOp::Rem
-pub bitcoin_units::MathOp::Sub
-pub bitcoin_units::NumOpResult::Error(bitcoin_units::NumOpError)
+impl<T: core::clone::Clone> core::clone::Clone for bitcoin_units::result::NumOpResult<T>
+impl<T: core::cmp::Eq> core::cmp::Eq for bitcoin_units::result::NumOpResult<T>
+impl<T: core::cmp::PartialEq> core::cmp::PartialEq for bitcoin_units::result::NumOpResult<T>
+impl<T: core::fmt::Debug> bitcoin_units::result::NumOpResult<T>
+impl<T: core::fmt::Debug> core::fmt::Debug for bitcoin_units::result::NumOpResult<T>
+impl<T: core::marker::Copy> core::marker::Copy for bitcoin_units::result::NumOpResult<T>
+impl<T> bitcoin_units::result::NumOpResult<T>
+impl<T> core::marker::Freeze for bitcoin_units::result::NumOpResult<T> where T: core::marker::Freeze
+impl<T> core::marker::Send for bitcoin_units::result::NumOpResult<T> where T: core::marker::Send
+impl<T> core::marker::StructuralPartialEq for bitcoin_units::result::NumOpResult<T>
+impl<T> core::marker::Sync for bitcoin_units::result::NumOpResult<T> where T: core::marker::Sync
+impl<T> core::marker::Unpin for bitcoin_units::result::NumOpResult<T> where T: core::marker::Unpin
+impl<T> core::ops::arith::Add for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<&T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<&bitcoin_units::result::NumOpResult<T>> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<&T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<T>> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::NumOpResult<T> where T: core::panic::unwind_safe::RefUnwindSafe
+impl<T> core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::NumOpResult<T> where T: core::panic::unwind_safe::UnwindSafe
+pub bitcoin_units::NumOpResult::Error(bitcoin_units::result::NumOpError)
 pub bitcoin_units::NumOpResult::Valid(T)
 pub bitcoin_units::absolute::LockTime::Blocks(bitcoin_units::locktime::absolute::Height)
 pub bitcoin_units::absolute::LockTime::Seconds(bitcoin_units::locktime::absolute::MedianTimePast)
@@ -1236,6 +1230,14 @@ pub bitcoin_units::relative::error::IsSatisfiedByHeightError::Incompatible(bitco
 pub bitcoin_units::relative::error::IsSatisfiedByHeightError::Satisfaction(bitcoin_units::locktime::relative::error::InvalidHeightError)
 pub bitcoin_units::relative::error::IsSatisfiedByTimeError::Incompatible(bitcoin_units::locktime::relative::NumberOfBlocks)
 pub bitcoin_units::relative::error::IsSatisfiedByTimeError::Satisfaction(bitcoin_units::locktime::relative::error::InvalidTimeError)
+pub bitcoin_units::result::MathOp::Add
+pub bitcoin_units::result::MathOp::Div
+pub bitcoin_units::result::MathOp::Mul
+pub bitcoin_units::result::MathOp::Neg
+pub bitcoin_units::result::MathOp::Rem
+pub bitcoin_units::result::MathOp::Sub
+pub bitcoin_units::result::NumOpResult::Error(bitcoin_units::result::NumOpError)
+pub bitcoin_units::result::NumOpResult::Valid(T)
 pub const bitcoin_units::Amount::FIFTY_BTC: Self
 pub const bitcoin_units::Amount::MAX: Self
 pub const bitcoin_units::Amount::MAX_MONEY: Self
@@ -1306,10 +1308,10 @@ pub const fn bitcoin_units::Amount::checked_div(self, rhs: u64) -> core::option:
 pub const fn bitcoin_units::Amount::checked_mul(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::Amount::checked_rem(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::Amount::checked_sub(self, rhs: Self) -> core::option::Option<Self>
-pub const fn bitcoin_units::Amount::div_by_fee_rate_ceil(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub const fn bitcoin_units::Amount::div_by_fee_rate_floor(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub const fn bitcoin_units::Amount::div_by_weight_ceil(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-pub const fn bitcoin_units::Amount::div_by_weight_floor(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+pub const fn bitcoin_units::Amount::div_by_fee_rate_ceil(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub const fn bitcoin_units::Amount::div_by_fee_rate_floor(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub const fn bitcoin_units::Amount::div_by_weight_ceil(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+pub const fn bitcoin_units::Amount::div_by_weight_floor(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 pub const fn bitcoin_units::Amount::from_btc_u16(whole_bitcoin: u16) -> Self
 pub const fn bitcoin_units::Amount::from_sat(satoshi: u64) -> core::result::Result<Self, bitcoin_units::amount::OutOfRangeError>
 pub const fn bitcoin_units::Amount::from_sat_u32(satoshi: u32) -> Self
@@ -1320,13 +1322,13 @@ pub const fn bitcoin_units::FeeRate::checked_add(self, rhs: bitcoin_units::FeeRa
 pub const fn bitcoin_units::FeeRate::checked_div(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::FeeRate::checked_mul(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::FeeRate::checked_sub(self, rhs: bitcoin_units::FeeRate) -> core::option::Option<Self>
-pub const fn bitcoin_units::FeeRate::from_per_kvb(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
-pub const fn bitcoin_units::FeeRate::from_per_kwu(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
-pub const fn bitcoin_units::FeeRate::from_per_vb(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_kvb(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_kwu(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_vb(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
 pub const fn bitcoin_units::FeeRate::from_sat_per_kvb(sat_kvb: u32) -> Self
 pub const fn bitcoin_units::FeeRate::from_sat_per_kwu(sat_kwu: u32) -> Self
 pub const fn bitcoin_units::FeeRate::from_sat_per_vb(sat_vb: u32) -> Self
-pub const fn bitcoin_units::FeeRate::mul_by_weight(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub const fn bitcoin_units::FeeRate::mul_by_weight(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub const fn bitcoin_units::FeeRate::to_fee(self, weight: bitcoin_units::Weight) -> bitcoin_units::Amount
 pub const fn bitcoin_units::FeeRate::to_sat_per_kvb_ceil(self) -> u64
 pub const fn bitcoin_units::FeeRate::to_sat_per_kvb_floor(self) -> u64
@@ -1356,7 +1358,7 @@ pub const fn bitcoin_units::Weight::from_vb_unchecked(vb: u64) -> Self
 pub const fn bitcoin_units::Weight::from_vb_unwrap(vb: u64) -> bitcoin_units::Weight
 pub const fn bitcoin_units::Weight::from_witness_data_size(witness_size: u64) -> Self
 pub const fn bitcoin_units::Weight::from_wu(wu: u64) -> Self
-pub const fn bitcoin_units::Weight::mul_by_fee_rate(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub const fn bitcoin_units::Weight::mul_by_fee_rate(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub const fn bitcoin_units::Weight::to_kwu_ceil(self) -> u64
 pub const fn bitcoin_units::Weight::to_kwu_floor(self) -> u64
 pub const fn bitcoin_units::Weight::to_vbytes_ceil(self) -> u64
@@ -1416,22 +1418,23 @@ pub enum bitcoin_units::relative::LockTime
 pub enum bitcoin_units::relative::error::IsSatisfiedByError
 pub enum bitcoin_units::relative::error::IsSatisfiedByHeightError
 pub enum bitcoin_units::relative::error::IsSatisfiedByTimeError
+pub enum bitcoin_units::result::NumOpResult<T>
 pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Amount) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::Amount) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::mul(self, rhs: &u64) -> Self::Output
@@ -1439,59 +1442,23 @@ pub fn &bitcoin_units::Amount::mul(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::rem(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Amount::rem(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::add(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::add(self, rhs: bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::FeeRate::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
-pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::sub(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::sub(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &core::num::nonzero::NonZeroI64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &i64) -> Self::Output
@@ -1502,10 +1469,10 @@ pub fn &bitcoin_units::SignedAmount::mul(self, rhs: &i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::mul(self, rhs: i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::rem(self, rhs: &i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::rem(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::Weight::add(self, rhs: &bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::add(self, rhs: bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
@@ -1515,10 +1482,10 @@ pub fn &bitcoin_units::Weight::div(self, rhs: bitcoin_units::Weight) -> Self::Ou
 pub fn &bitcoin_units::Weight::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Weight::div(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Weight::rem(self, rhs: &bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::rem(self, rhs: &u64) -> Self::Output
@@ -1546,20 +1513,56 @@ pub fn &bitcoin_units::block::BlockMtpInterval::add(self, rhs: &bitcoin_units::b
 pub fn &bitcoin_units::block::BlockMtpInterval::add(self, rhs: bitcoin_units::block::BlockMtpInterval) -> Self::Output
 pub fn &bitcoin_units::block::BlockMtpInterval::sub(self, rhs: &bitcoin_units::block::BlockMtpInterval) -> Self::Output
 pub fn &bitcoin_units::block::BlockMtpInterval::sub(self, rhs: bitcoin_units::block::BlockMtpInterval) -> Self::Output
-pub fn &i64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &i64::mul(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &i64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &i64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &i64::mul(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &i64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &u64::mul(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &u64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &u64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &u64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &u64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
 pub fn bitcoin_units::Amount::clone(&self) -> bitcoin_units::Amount
 pub fn bitcoin_units::Amount::cmp(&self, other: &bitcoin_units::Amount) -> core::cmp::Ordering
@@ -1568,16 +1571,16 @@ pub fn bitcoin_units::Amount::display_dynamic(self) -> bitcoin_units::amount::Di
 pub fn bitcoin_units::Amount::display_in(self, denomination: bitcoin_units::amount::Denomination) -> bitcoin_units::amount::Display
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Amount) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &u64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::Amount) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: u64) -> Self::Output
 pub fn bitcoin_units::Amount::eq(&self, other: &bitcoin_units::Amount) -> bool
@@ -1596,9 +1599,9 @@ pub fn bitcoin_units::Amount::rem(self, modulus: u64) -> Self::Output
 pub fn bitcoin_units::Amount::rem(self, rhs: &u64) -> Self::Output
 pub fn bitcoin_units::Amount::signed_sub(self, rhs: bitcoin_units::Amount) -> bitcoin_units::SignedAmount
 pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::to_btc(self) -> f64
 pub fn bitcoin_units::Amount::to_float_in(self, denom: bitcoin_units::amount::Denomination) -> f64
 pub fn bitcoin_units::Amount::to_signed(self) -> bitcoin_units::SignedAmount
@@ -1629,10 +1632,10 @@ pub fn bitcoin_units::FeeRate::fee_vb(self, vb: u64) -> core::option::Option<bit
 pub fn bitcoin_units::FeeRate::fee_wu(self, weight: bitcoin_units::Weight) -> core::option::Option<bitcoin_units::Amount>
 pub fn bitcoin_units::FeeRate::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin_units::FeeRate::hash<__H: core::hash::Hasher>(&self, state: &mut __H)
-pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::partial_cmp(&self, other: &bitcoin_units::FeeRate) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin_units::FeeRate::sub(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn bitcoin_units::FeeRate::sub(self, rhs: bitcoin_units::FeeRate) -> Self::Output
@@ -1640,93 +1643,10 @@ pub fn bitcoin_units::FeeRate::sub_assign(&mut self, rhs: &bitcoin_units::FeeRat
 pub fn bitcoin_units::FeeRate::sub_assign(&mut self, rhs: bitcoin_units::FeeRate)
 pub fn bitcoin_units::FeeRate::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::FeeRate>
 pub fn bitcoin_units::FeeRate::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = Self>
-pub fn bitcoin_units::MathOp::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
-pub fn bitcoin_units::MathOp::clone(&self) -> bitcoin_units::MathOp
-pub fn bitcoin_units::MathOp::eq(&self, other: &bitcoin_units::MathOp) -> bool
-pub fn bitcoin_units::MathOp::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin_units::MathOp::is_addition(self) -> bool
-pub fn bitcoin_units::MathOp::is_div_by_zero(self) -> bool
-pub fn bitcoin_units::MathOp::is_multiplication(self) -> bool
-pub fn bitcoin_units::MathOp::is_negation(self) -> bool
-pub fn bitcoin_units::MathOp::is_overflow(self) -> bool
-pub fn bitcoin_units::MathOp::is_subtraction(self) -> bool
-pub fn bitcoin_units::NumOpError::clone(&self) -> bitcoin_units::NumOpError
-pub fn bitcoin_units::NumOpError::eq(&self, other: &bitcoin_units::NumOpError) -> bool
-pub fn bitcoin_units::NumOpError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin_units::NumOpError::is_div_by_zero(self) -> bool
-pub fn bitcoin_units::NumOpError::is_overflow(self) -> bool
-pub fn bitcoin_units::NumOpError::operation(self) -> bitcoin_units::MathOp
-pub fn bitcoin_units::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::add(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::add(self, rhs: Self) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::add(self, rhs: T) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::and_then<F>(self, op: F) -> bitcoin_units::NumOpResult<T> where F: core::ops::function::FnOnce(T) -> bitcoin_units::NumOpResult<T>
-pub fn bitcoin_units::NumOpResult<T>::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
-pub fn bitcoin_units::NumOpResult<T>::clone(&self) -> bitcoin_units::NumOpResult<T>
-pub fn bitcoin_units::NumOpResult<T>::eq(&self, other: &bitcoin_units::NumOpResult<T>) -> bool
-pub fn bitcoin_units::NumOpResult<T>::expect(self, msg: &str) -> T
-pub fn bitcoin_units::NumOpResult<T>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin_units::NumOpResult<T>::into_result(self) -> core::result::Result<T, bitcoin_units::NumOpError>
-pub fn bitcoin_units::NumOpResult<T>::is_error(&self) -> bool
-pub fn bitcoin_units::NumOpResult<T>::is_valid(&self) -> bool
-pub fn bitcoin_units::NumOpResult<T>::map<U, F: core::ops::function::FnOnce(T) -> U>(self, op: F) -> bitcoin_units::NumOpResult<U>
-pub fn bitcoin_units::NumOpResult<T>::ok(self) -> core::option::Option<T>
-pub fn bitcoin_units::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::sub(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::sub(self, rhs: Self) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
-pub fn bitcoin_units::NumOpResult<T>::unwrap(self) -> T
-pub fn bitcoin_units::NumOpResult<T>::unwrap_err(self) -> bitcoin_units::NumOpError
-pub fn bitcoin_units::NumOpResult<T>::unwrap_or(self, default: T) -> T
-pub fn bitcoin_units::NumOpResult<T>::unwrap_or_else<F>(self, f: F) -> T where F: core::ops::function::FnOnce() -> T
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div_assign(&mut self, rhs: &u64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::div_assign(&mut self, rhs: u64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::from(a: &bitcoin_units::Amount) -> Self
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::from(a: bitcoin_units::Amount) -> Self
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul_assign(&mut self, rhs: &u64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul_assign(&mut self, rhs: u64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, modulus: u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::NumOpResult<bitcoin_units::Amount>>
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Amount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = bitcoin_units::NumOpResult<bitcoin_units::Amount>>
-pub fn bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div_assign(&mut self, rhs: &i64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div_assign(&mut self, rhs: i64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::from(a: &bitcoin_units::SignedAmount) -> Self
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::from(a: bitcoin_units::SignedAmount) -> Self
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul_assign(&mut self, rhs: &i64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul_assign(&mut self, rhs: i64)
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, modulus: i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>
-pub fn bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
 pub fn bitcoin_units::SignedAmount::clone(&self) -> bitcoin_units::SignedAmount
 pub fn bitcoin_units::SignedAmount::cmp(&self, other: &bitcoin_units::SignedAmount) -> core::cmp::Ordering
@@ -1759,10 +1679,10 @@ pub fn bitcoin_units::SignedAmount::positive_sub(self, rhs: Self) -> core::optio
 pub fn bitcoin_units::SignedAmount::rem(self, modulus: i64) -> Self::Output
 pub fn bitcoin_units::SignedAmount::rem(self, rhs: &i64) -> Self::Output
 pub fn bitcoin_units::SignedAmount::signum(self) -> i64
-pub fn bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn bitcoin_units::SignedAmount::to_btc(self) -> f64
 pub fn bitcoin_units::SignedAmount::to_float_in(self, denom: bitcoin_units::amount::Denomination) -> f64
 pub fn bitcoin_units::SignedAmount::to_string_in(self, denom: bitcoin_units::amount::Denomination) -> alloc::string::String
@@ -1789,10 +1709,10 @@ pub fn bitcoin_units::Weight::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> co
 pub fn bitcoin_units::Weight::from_str(s: &str) -> core::result::Result<Self, Self::Err>
 pub fn bitcoin_units::Weight::hash<__H: core::hash::Hasher>(&self, state: &mut __H)
 pub fn bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn bitcoin_units::Weight::mul(self, rhs: &u64) -> Self::Output
 pub fn bitcoin_units::Weight::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Weight::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Weight::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn bitcoin_units::Weight::mul(self, rhs: u64) -> Self::Output
 pub fn bitcoin_units::Weight::mul_assign(&mut self, rhs: u64)
 pub fn bitcoin_units::Weight::partial_cmp(&self, other: &bitcoin_units::Weight) -> core::option::Option<core::cmp::Ordering>
@@ -2185,6 +2105,89 @@ pub fn bitcoin_units::parse::hex_u32_unprefixed(s: &str) -> core::result::Result
 pub fn bitcoin_units::parse::int_from_box<T: bitcoin_units::parse::Integer>(s: alloc::boxed::Box<str>) -> core::result::Result<T, bitcoin_units::parse::ParseIntError>
 pub fn bitcoin_units::parse::int_from_str<T: bitcoin_units::parse::Integer>(s: &str) -> core::result::Result<T, bitcoin_units::parse::ParseIntError>
 pub fn bitcoin_units::parse::int_from_string<T: bitcoin_units::parse::Integer>(s: alloc::string::String) -> core::result::Result<T, bitcoin_units::parse::ParseIntError>
+pub fn bitcoin_units::result::MathOp::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
+pub fn bitcoin_units::result::MathOp::clone(&self) -> bitcoin_units::result::MathOp
+pub fn bitcoin_units::result::MathOp::eq(&self, other: &bitcoin_units::result::MathOp) -> bool
+pub fn bitcoin_units::result::MathOp::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin_units::result::MathOp::is_addition(self) -> bool
+pub fn bitcoin_units::result::MathOp::is_div_by_zero(self) -> bool
+pub fn bitcoin_units::result::MathOp::is_multiplication(self) -> bool
+pub fn bitcoin_units::result::MathOp::is_negation(self) -> bool
+pub fn bitcoin_units::result::MathOp::is_overflow(self) -> bool
+pub fn bitcoin_units::result::MathOp::is_subtraction(self) -> bool
+pub fn bitcoin_units::result::NumOpError::clone(&self) -> bitcoin_units::result::NumOpError
+pub fn bitcoin_units::result::NumOpError::eq(&self, other: &bitcoin_units::result::NumOpError) -> bool
+pub fn bitcoin_units::result::NumOpError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin_units::result::NumOpError::is_div_by_zero(self) -> bool
+pub fn bitcoin_units::result::NumOpError::is_overflow(self) -> bool
+pub fn bitcoin_units::result::NumOpError::operation(self) -> bitcoin_units::result::MathOp
+pub fn bitcoin_units::result::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::add(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::add(self, rhs: Self) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::add(self, rhs: T) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::and_then<F>(self, op: F) -> bitcoin_units::result::NumOpResult<T> where F: core::ops::function::FnOnce(T) -> bitcoin_units::result::NumOpResult<T>
+pub fn bitcoin_units::result::NumOpResult<T>::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
+pub fn bitcoin_units::result::NumOpResult<T>::clone(&self) -> bitcoin_units::result::NumOpResult<T>
+pub fn bitcoin_units::result::NumOpResult<T>::eq(&self, other: &bitcoin_units::result::NumOpResult<T>) -> bool
+pub fn bitcoin_units::result::NumOpResult<T>::expect(self, msg: &str) -> T
+pub fn bitcoin_units::result::NumOpResult<T>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
+pub fn bitcoin_units::result::NumOpResult<T>::into_result(self) -> core::result::Result<T, bitcoin_units::result::NumOpError>
+pub fn bitcoin_units::result::NumOpResult<T>::is_error(&self) -> bool
+pub fn bitcoin_units::result::NumOpResult<T>::is_valid(&self) -> bool
+pub fn bitcoin_units::result::NumOpResult<T>::map<U, F: core::ops::function::FnOnce(T) -> U>(self, op: F) -> bitcoin_units::result::NumOpResult<U>
+pub fn bitcoin_units::result::NumOpResult<T>::ok(self) -> core::option::Option<T>
+pub fn bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::sub(self, rhs: Self) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<T>::unwrap(self) -> T
+pub fn bitcoin_units::result::NumOpResult<T>::unwrap_err(self) -> bitcoin_units::result::NumOpError
+pub fn bitcoin_units::result::NumOpResult<T>::unwrap_or(self, default: T) -> T
+pub fn bitcoin_units::result::NumOpResult<T>::unwrap_or_else<F>(self, f: F) -> T where F: core::ops::function::FnOnce() -> T
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div_assign(&mut self, rhs: &u64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div_assign(&mut self, rhs: u64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::from(a: &bitcoin_units::Amount) -> Self
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::from(a: bitcoin_units::Amount) -> Self
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul_assign(&mut self, rhs: &u64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul_assign(&mut self, rhs: u64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, modulus: u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div_assign(&mut self, rhs: &i64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div_assign(&mut self, rhs: i64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::from(a: &bitcoin_units::SignedAmount) -> Self
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::from(a: bitcoin_units::SignedAmount) -> Self
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul_assign(&mut self, rhs: &i64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul_assign(&mut self, rhs: i64)
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, modulus: i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn bitcoin_units::sequence::Sequence::arbitrary(u: &mut arbitrary::unstructured::Unstructured<'a>) -> arbitrary::error::Result<Self>
 pub fn bitcoin_units::sequence::Sequence::clone(&self) -> bitcoin_units::sequence::Sequence
 pub fn bitcoin_units::sequence::Sequence::cmp(&self, other: &bitcoin_units::sequence::Sequence) -> core::cmp::Ordering
@@ -2217,10 +2220,10 @@ pub fn bitcoin_units::sequence::Sequence::try_from(s: &str) -> core::result::Res
 pub fn bitcoin_units::sequence::Sequence::try_from(s: alloc::boxed::Box<str>) -> core::result::Result<Self, Self::Error>
 pub fn bitcoin_units::sequence::Sequence::try_from(s: alloc::string::String) -> core::result::Result<Self, Self::Error>
 pub fn core::num::error::ParseIntError::from(value: bitcoin_units::parse::ParseIntError) -> Self
-pub fn i64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn i64::mul(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn i64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn i64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn i64::mul(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn i64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn u32::from(height: bitcoin_units::block::BlockHeight) -> Self
 pub fn u32::from(height: bitcoin_units::block::BlockHeightInterval) -> Self
 pub fn u32::from(height: bitcoin_units::block::BlockMtp) -> Self
@@ -2229,11 +2232,11 @@ pub fn u32::from(sequence: bitcoin_units::sequence::Sequence) -> u32
 pub fn u32::from(t: bitcoin_units::BlockTime) -> Self
 pub fn u64::from(value: bitcoin_units::Weight) -> Self
 pub fn u64::mul(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn u64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn u64::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn u64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn u64::mul(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn u64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn u64::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn u64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub mod bitcoin_units
 pub mod bitcoin_units::absolute
 pub mod bitcoin_units::absolute::error
@@ -2263,6 +2266,7 @@ pub mod bitcoin_units::locktime::relative::error
 pub mod bitcoin_units::parse
 pub mod bitcoin_units::relative
 pub mod bitcoin_units::relative::error
+pub mod bitcoin_units::result
 pub mod bitcoin_units::sequence
 pub mod bitcoin_units::time
 pub mod bitcoin_units::weight
@@ -2338,57 +2342,39 @@ pub struct bitcoin_units::sequence::Sequence(pub u32)
 pub struct bitcoin_units::time::BlockTime(_)
 pub struct bitcoin_units::weight::Weight(_)
 pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr<Err = core::num::error::ParseIntError> + core::convert::TryFrom<i8> + core::marker::Sized + bitcoin_units::parse::sealed::Sealed
-pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
+pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
-pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::Weight>>::Output
+pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<core::num::nonzero::NonZero<u64>>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<u64>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Mul<u64>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Rem<u64>>::Output
-pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
+pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type &bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub>::Output
 pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Add>::Output
 pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Div<core::num::nonzero::NonZero<u64>>>::Output
-pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
+pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type &bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Sub>::Output
-pub type &bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Add<T>>::Output
-pub type &bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Add>::Output
-pub type &bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Sub<T>>::Output
-pub type &bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Sub>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::Weight>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<u64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Mul<u64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Rem<u64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Div<i64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Mul<i64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Rem<i64>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
-pub type &bitcoin_units::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div<core::num::nonzero::NonZero<i64>>>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div<i64>>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Mul<i64>>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Rem<i64>>::Output
-pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type &bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Add>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Div<core::num::nonzero::NonZero<u64>>>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Div<u64>>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Div>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
-pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<u64>>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Rem<u64>>::Output
 pub type &bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Rem>::Output
@@ -2403,76 +2389,69 @@ pub type &bitcoin_units::block::BlockMtp::Output = <bitcoin_units::block::BlockM
 pub type &bitcoin_units::block::BlockMtp::Output = <bitcoin_units::block::BlockMtp as core::ops::arith::Sub>::Output
 pub type &bitcoin_units::block::BlockMtpInterval::Output = <bitcoin_units::block::BlockMtpInterval as core::ops::arith::Add>::Output
 pub type &bitcoin_units::block::BlockMtpInterval::Output = <bitcoin_units::block::BlockMtpInterval as core::ops::arith::Sub>::Output
-pub type &i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type &bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Add<T>>::Output
+pub type &bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Add>::Output
+pub type &bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Sub<T>>::Output
+pub type &bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Sub>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::Weight>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<u64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Mul<u64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Rem<u64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Div<i64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Mul<i64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Rem<i64>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
+pub type &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
 pub type &i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::SignedAmount>>::Output
+pub type &i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type &u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::Amount>>::Output
-pub type &u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type &u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
+pub type &u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type bitcoin_units::Amount::Err = bitcoin_units::amount::ParseError
 pub type bitcoin_units::Amount::Error = bitcoin_units::amount::OutOfRangeError
-pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
+pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Add>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
-pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::Weight>>::Output
+pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<core::num::nonzero::NonZero<u64>>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div<u64>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Div>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Mul<u64>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Rem<u64>>::Output
-pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
+pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type bitcoin_units::Amount::Output = <bitcoin_units::Amount as core::ops::arith::Sub>::Output
 pub type bitcoin_units::Amount::Output = bitcoin_units::Amount
-pub type bitcoin_units::Amount::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
-pub type bitcoin_units::Amount::Output = bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-pub type bitcoin_units::Amount::Output = bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub type bitcoin_units::Amount::Output = bitcoin_units::NumOpResult<u64>
+pub type bitcoin_units::Amount::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+pub type bitcoin_units::Amount::Output = bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+pub type bitcoin_units::Amount::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub type bitcoin_units::Amount::Output = bitcoin_units::result::NumOpResult<u64>
 pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Add>::Output
 pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Div<core::num::nonzero::NonZero<u64>>>::Output
-pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
+pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
 pub type bitcoin_units::FeeRate::Output = <bitcoin_units::FeeRate as core::ops::arith::Sub>::Output
 pub type bitcoin_units::FeeRate::Output = bitcoin_units::FeeRate
-pub type bitcoin_units::FeeRate::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
-pub type bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Add<T>>::Output
-pub type bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Add>::Output
-pub type bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Sub<T>>::Output
-pub type bitcoin_units::NumOpResult<T>::Output = <bitcoin_units::NumOpResult<T> as core::ops::arith::Sub>::Output
-pub type bitcoin_units::NumOpResult<T>::Output = bitcoin_units::NumOpResult<T>
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::Weight>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<u64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Mul<u64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Rem<u64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-pub type bitcoin_units::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub type bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
-pub type bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Div<i64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Mul<i64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Rem<i64>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::Output = bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-pub type bitcoin_units::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
-pub type bitcoin_units::NumOpResult<bitcoin_units::Weight>::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub type bitcoin_units::FeeRate::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub type bitcoin_units::SignedAmount::Err = bitcoin_units::amount::ParseError
-pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Add>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div<core::num::nonzero::NonZero<i64>>>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div<i64>>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Div>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Mul<i64>>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Rem<i64>>::Output
-pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type bitcoin_units::SignedAmount::Output = <bitcoin_units::SignedAmount as core::ops::arith::Sub>::Output
-pub type bitcoin_units::SignedAmount::Output = bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-pub type bitcoin_units::SignedAmount::Output = bitcoin_units::NumOpResult<i64>
 pub type bitcoin_units::SignedAmount::Output = bitcoin_units::SignedAmount
+pub type bitcoin_units::SignedAmount::Output = bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+pub type bitcoin_units::SignedAmount::Output = bitcoin_units::result::NumOpResult<i64>
 pub type bitcoin_units::Weight::Err = bitcoin_units::parse::ParseIntError
 pub type bitcoin_units::Weight::Error = bitcoin_units::parse::ParseIntError
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Add>::Output
@@ -2480,13 +2459,13 @@ pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::ar
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Div<u64>>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Div>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
-pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Mul<u64>>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Rem<u64>>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Rem>::Output
 pub type bitcoin_units::Weight::Output = <bitcoin_units::Weight as core::ops::arith::Sub>::Output
-pub type bitcoin_units::Weight::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
 pub type bitcoin_units::Weight::Output = bitcoin_units::Weight
+pub type bitcoin_units::Weight::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub type bitcoin_units::Weight::Output = u64
 pub type bitcoin_units::amount::Denomination::Err = bitcoin_units::amount::ParseDenominationError
 pub type bitcoin_units::block::BlockHeight::Err = bitcoin_units::parse::ParseIntError
@@ -2527,13 +2506,38 @@ pub type bitcoin_units::locktime::relative::NumberOf512Seconds::Error = bitcoin_
 pub type bitcoin_units::locktime::relative::NumberOfBlocks::Err = bitcoin_units::parse::ParseIntError
 pub type bitcoin_units::locktime::relative::NumberOfBlocks::Error = bitcoin_units::block::TooBigForRelativeHeightError
 pub type bitcoin_units::locktime::relative::NumberOfBlocks::Error = bitcoin_units::parse::ParseIntError
+pub type bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Add<T>>::Output
+pub type bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Add>::Output
+pub type bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Sub<T>>::Output
+pub type bitcoin_units::result::NumOpResult<T>::Output = <bitcoin_units::result::NumOpResult<T> as core::ops::arith::Sub>::Output
+pub type bitcoin_units::result::NumOpResult<T>::Output = bitcoin_units::result::NumOpResult<T>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::FeeRate>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::Weight>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Div<u64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Mul<u64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Amount> as core::ops::arith::Rem<u64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate> as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Div<i64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Mul<i64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount> as core::ops::arith::Rem<i64>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::FeeRate>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::Output = <bitcoin_units::result::NumOpResult<bitcoin_units::Weight> as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>>>::Output
+pub type bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub type bitcoin_units::sequence::Sequence::Err = bitcoin_units::parse::ParseIntError
 pub type bitcoin_units::sequence::Sequence::Error = bitcoin_units::parse::ParseIntError
-pub type i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>>>::Output
 pub type i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::SignedAmount>>::Output
-pub type i64::Output = bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+pub type i64::Output = <i64 as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>>>::Output
+pub type i64::Output = bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 pub type u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::Amount>>::Output
-pub type u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::Weight>>::Output
-pub type u64::Output = bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub type u64::Output = <u64 as core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>>>::Output
 pub type u64::Output = bitcoin_units::Weight
+pub type u64::Output = bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
diff --git a/api/units/alloc-only.txt b/api/units/alloc-only.txt
index ffc92bcf..ededefef 100644
--- a/api/units/alloc-only.txt
+++ b/api/units/alloc-only.txt
@@ -1,7 +1,6 @@
-#[non_exhaustive] pub enum bitcoin_units::MathOp
 #[non_exhaustive] pub enum bitcoin_units::amount::Denomination
 #[non_exhaustive] pub enum bitcoin_units::amount::ParseDenominationError
-#[non_exhaustive] pub struct bitcoin_units::NumOpError(_)
+#[non_exhaustive] pub enum bitcoin_units::result::MathOp
 #[non_exhaustive] pub struct bitcoin_units::absolute::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::absolute::error::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::amount::MissingDenominationError
@@ -10,11 +9,10 @@
 #[non_exhaustive] pub struct bitcoin_units::locktime::absolute::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::locktime::absolute::error::ConversionError
 #[non_exhaustive] pub struct bitcoin_units::parse::ParseIntError
+#[non_exhaustive] pub struct bitcoin_units::result::NumOpError(_)
 impl bitcoin_units::Amount
 impl bitcoin_units::BlockTime
 impl bitcoin_units::FeeRate
-impl bitcoin_units::MathOp
-impl bitcoin_units::NumOpError
 impl bitcoin_units::SignedAmount
 impl bitcoin_units::Weight
 impl bitcoin_units::amount::Denomination
@@ -43,12 +41,12 @@ impl bitcoin_units::parse::Integer for u16
 impl bitcoin_units::parse::Integer for u32
 impl bitcoin_units::parse::Integer for u64
 impl bitcoin_units::parse::Integer for u8
+impl bitcoin_units::result::MathOp
+impl bitcoin_units::result::NumOpError
 impl bitcoin_units::sequence::Sequence
 impl core::clone::Clone for bitcoin_units::Amount
 impl core::clone::Clone for bitcoin_units::BlockTime
 impl core::clone::Clone for bitcoin_units::FeeRate
-impl core::clone::Clone for bitcoin_units::MathOp
-impl core::clone::Clone for bitcoin_units::NumOpError
 impl core::clone::Clone for bitcoin_units::SignedAmount
 impl core::clone::Clone for bitcoin_units::Weight
 impl core::clone::Clone for bitcoin_units::amount::Denomination
@@ -90,12 +88,12 @@ impl core::clone::Clone for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::clone::Clone for bitcoin_units::parse::ParseIntError
 impl core::clone::Clone for bitcoin_units::parse::PrefixedHexError
 impl core::clone::Clone for bitcoin_units::parse::UnprefixedHexError
+impl core::clone::Clone for bitcoin_units::result::MathOp
+impl core::clone::Clone for bitcoin_units::result::NumOpError
 impl core::clone::Clone for bitcoin_units::sequence::Sequence
 impl core::cmp::Eq for bitcoin_units::Amount
 impl core::cmp::Eq for bitcoin_units::BlockTime
 impl core::cmp::Eq for bitcoin_units::FeeRate
-impl core::cmp::Eq for bitcoin_units::MathOp
-impl core::cmp::Eq for bitcoin_units::NumOpError
 impl core::cmp::Eq for bitcoin_units::SignedAmount
 impl core::cmp::Eq for bitcoin_units::Weight
 impl core::cmp::Eq for bitcoin_units::amount::Denomination
@@ -136,6 +134,8 @@ impl core::cmp::Eq for bitcoin_units::locktime::relative::error::TimeOverflowErr
 impl core::cmp::Eq for bitcoin_units::parse::ParseIntError
 impl core::cmp::Eq for bitcoin_units::parse::PrefixedHexError
 impl core::cmp::Eq for bitcoin_units::parse::UnprefixedHexError
+impl core::cmp::Eq for bitcoin_units::result::MathOp
+impl core::cmp::Eq for bitcoin_units::result::NumOpError
 impl core::cmp::Eq for bitcoin_units::sequence::Sequence
 impl core::cmp::Ord for bitcoin_units::Amount
 impl core::cmp::Ord for bitcoin_units::BlockTime
@@ -154,8 +154,6 @@ impl core::cmp::Ord for bitcoin_units::sequence::Sequence
 impl core::cmp::PartialEq for bitcoin_units::Amount
 impl core::cmp::PartialEq for bitcoin_units::BlockTime
 impl core::cmp::PartialEq for bitcoin_units::FeeRate
-impl core::cmp::PartialEq for bitcoin_units::MathOp
-impl core::cmp::PartialEq for bitcoin_units::NumOpError
 impl core::cmp::PartialEq for bitcoin_units::SignedAmount
 impl core::cmp::PartialEq for bitcoin_units::Weight
 impl core::cmp::PartialEq for bitcoin_units::amount::Denomination
@@ -196,6 +194,8 @@ impl core::cmp::PartialEq for bitcoin_units::locktime::relative::error::TimeOver
 impl core::cmp::PartialEq for bitcoin_units::parse::ParseIntError
 impl core::cmp::PartialEq for bitcoin_units::parse::PrefixedHexError
 impl core::cmp::PartialEq for bitcoin_units::parse::UnprefixedHexError
+impl core::cmp::PartialEq for bitcoin_units::result::MathOp
+impl core::cmp::PartialEq for bitcoin_units::result::NumOpError
 impl core::cmp::PartialEq for bitcoin_units::sequence::Sequence
 impl core::cmp::PartialOrd for bitcoin_units::Amount
 impl core::cmp::PartialOrd for bitcoin_units::BlockTime
@@ -212,12 +212,12 @@ impl core::cmp::PartialOrd for bitcoin_units::locktime::relative::NumberOf512Sec
 impl core::cmp::PartialOrd for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::cmp::PartialOrd for bitcoin_units::sequence::Sequence
 impl core::convert::AsRef<core::num::error::ParseIntError> for bitcoin_units::parse::ParseIntError
-impl core::convert::From<&bitcoin_units::Amount> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::convert::From<&bitcoin_units::SignedAmount> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::convert::From<&bitcoin_units::Amount> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::convert::From<&bitcoin_units::SignedAmount> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::SignedAmount
+impl core::convert::From<bitcoin_units::Amount> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::convert::From<bitcoin_units::BlockTime> for u32
-impl core::convert::From<bitcoin_units::SignedAmount> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::convert::From<bitcoin_units::SignedAmount> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::convert::From<bitcoin_units::Weight> for u64
 impl core::convert::From<bitcoin_units::amount::InputTooLargeError> for bitcoin_units::amount::ParseAmountError
 impl core::convert::From<bitcoin_units::amount::InputTooLargeError> for bitcoin_units::amount::ParseError
@@ -307,8 +307,6 @@ impl core::default::Default for bitcoin_units::sequence::Sequence
 impl core::fmt::Debug for bitcoin_units::Amount
 impl core::fmt::Debug for bitcoin_units::BlockTime
 impl core::fmt::Debug for bitcoin_units::FeeRate
-impl core::fmt::Debug for bitcoin_units::MathOp
-impl core::fmt::Debug for bitcoin_units::NumOpError
 impl core::fmt::Debug for bitcoin_units::SignedAmount
 impl core::fmt::Debug for bitcoin_units::Weight
 impl core::fmt::Debug for bitcoin_units::amount::Denomination
@@ -350,10 +348,10 @@ impl core::fmt::Debug for bitcoin_units::locktime::relative::error::TimeOverflow
 impl core::fmt::Debug for bitcoin_units::parse::ParseIntError
 impl core::fmt::Debug for bitcoin_units::parse::PrefixedHexError
 impl core::fmt::Debug for bitcoin_units::parse::UnprefixedHexError
+impl core::fmt::Debug for bitcoin_units::result::MathOp
+impl core::fmt::Debug for bitcoin_units::result::NumOpError
 impl core::fmt::Debug for bitcoin_units::sequence::Sequence
 impl core::fmt::Display for bitcoin_units::Amount
-impl core::fmt::Display for bitcoin_units::MathOp
-impl core::fmt::Display for bitcoin_units::NumOpError
 impl core::fmt::Display for bitcoin_units::SignedAmount
 impl core::fmt::Display for bitcoin_units::Weight
 impl core::fmt::Display for bitcoin_units::amount::Denomination
@@ -394,6 +392,8 @@ impl core::fmt::Display for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::fmt::Display for bitcoin_units::parse::ParseIntError
 impl core::fmt::Display for bitcoin_units::parse::PrefixedHexError
 impl core::fmt::Display for bitcoin_units::parse::UnprefixedHexError
+impl core::fmt::Display for bitcoin_units::result::MathOp
+impl core::fmt::Display for bitcoin_units::result::NumOpError
 impl core::fmt::Display for bitcoin_units::sequence::Sequence
 impl core::fmt::LowerHex for bitcoin_units::sequence::Sequence
 impl core::fmt::UpperHex for bitcoin_units::sequence::Sequence
@@ -415,16 +415,14 @@ impl core::hash::Hash for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::hash::Hash for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::hash::Hash for bitcoin_units::sequence::Sequence
 impl core::iter::traits::accum::Sum for bitcoin_units::FeeRate
-impl core::iter::traits::accum::Sum for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::iter::traits::accum::Sum for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::iter::traits::accum::Sum for bitcoin_units::Weight
 impl core::iter::traits::accum::Sum for bitcoin_units::block::BlockHeightInterval
 impl core::iter::traits::accum::Sum for bitcoin_units::block::BlockMtpInterval
+impl core::iter::traits::accum::Sum for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::iter::traits::accum::Sum for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::marker::Copy for bitcoin_units::Amount
 impl core::marker::Copy for bitcoin_units::BlockTime
 impl core::marker::Copy for bitcoin_units::FeeRate
-impl core::marker::Copy for bitcoin_units::MathOp
-impl core::marker::Copy for bitcoin_units::NumOpError
 impl core::marker::Copy for bitcoin_units::SignedAmount
 impl core::marker::Copy for bitcoin_units::Weight
 impl core::marker::Copy for bitcoin_units::amount::Denomination
@@ -439,12 +437,12 @@ impl core::marker::Copy for bitcoin_units::locktime::absolute::MedianTimePast
 impl core::marker::Copy for bitcoin_units::locktime::relative::LockTime
 impl core::marker::Copy for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::marker::Copy for bitcoin_units::locktime::relative::NumberOfBlocks
+impl core::marker::Copy for bitcoin_units::result::MathOp
+impl core::marker::Copy for bitcoin_units::result::NumOpError
 impl core::marker::Copy for bitcoin_units::sequence::Sequence
 impl core::marker::Freeze for bitcoin_units::Amount
 impl core::marker::Freeze for bitcoin_units::BlockTime
 impl core::marker::Freeze for bitcoin_units::FeeRate
-impl core::marker::Freeze for bitcoin_units::MathOp
-impl core::marker::Freeze for bitcoin_units::NumOpError
 impl core::marker::Freeze for bitcoin_units::SignedAmount
 impl core::marker::Freeze for bitcoin_units::Weight
 impl core::marker::Freeze for bitcoin_units::amount::Denomination
@@ -486,12 +484,12 @@ impl core::marker::Freeze for bitcoin_units::locktime::relative::error::TimeOver
 impl core::marker::Freeze for bitcoin_units::parse::ParseIntError
 impl core::marker::Freeze for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Freeze for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Freeze for bitcoin_units::result::MathOp
+impl core::marker::Freeze for bitcoin_units::result::NumOpError
 impl core::marker::Freeze for bitcoin_units::sequence::Sequence
 impl core::marker::Send for bitcoin_units::Amount
 impl core::marker::Send for bitcoin_units::BlockTime
 impl core::marker::Send for bitcoin_units::FeeRate
-impl core::marker::Send for bitcoin_units::MathOp
-impl core::marker::Send for bitcoin_units::NumOpError
 impl core::marker::Send for bitcoin_units::SignedAmount
 impl core::marker::Send for bitcoin_units::Weight
 impl core::marker::Send for bitcoin_units::amount::Denomination
@@ -533,12 +531,12 @@ impl core::marker::Send for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::marker::Send for bitcoin_units::parse::ParseIntError
 impl core::marker::Send for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Send for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Send for bitcoin_units::result::MathOp
+impl core::marker::Send for bitcoin_units::result::NumOpError
 impl core::marker::Send for bitcoin_units::sequence::Sequence
 impl core::marker::StructuralPartialEq for bitcoin_units::Amount
 impl core::marker::StructuralPartialEq for bitcoin_units::BlockTime
 impl core::marker::StructuralPartialEq for bitcoin_units::FeeRate
-impl core::marker::StructuralPartialEq for bitcoin_units::MathOp
-impl core::marker::StructuralPartialEq for bitcoin_units::NumOpError
 impl core::marker::StructuralPartialEq for bitcoin_units::SignedAmount
 impl core::marker::StructuralPartialEq for bitcoin_units::Weight
 impl core::marker::StructuralPartialEq for bitcoin_units::amount::Denomination
@@ -579,12 +577,12 @@ impl core::marker::StructuralPartialEq for bitcoin_units::locktime::relative::er
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::ParseIntError
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::PrefixedHexError
 impl core::marker::StructuralPartialEq for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::StructuralPartialEq for bitcoin_units::result::MathOp
+impl core::marker::StructuralPartialEq for bitcoin_units::result::NumOpError
 impl core::marker::StructuralPartialEq for bitcoin_units::sequence::Sequence
 impl core::marker::Sync for bitcoin_units::Amount
 impl core::marker::Sync for bitcoin_units::BlockTime
 impl core::marker::Sync for bitcoin_units::FeeRate
-impl core::marker::Sync for bitcoin_units::MathOp
-impl core::marker::Sync for bitcoin_units::NumOpError
 impl core::marker::Sync for bitcoin_units::SignedAmount
 impl core::marker::Sync for bitcoin_units::Weight
 impl core::marker::Sync for bitcoin_units::amount::Denomination
@@ -626,12 +624,12 @@ impl core::marker::Sync for bitcoin_units::locktime::relative::error::TimeOverfl
 impl core::marker::Sync for bitcoin_units::parse::ParseIntError
 impl core::marker::Sync for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Sync for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Sync for bitcoin_units::result::MathOp
+impl core::marker::Sync for bitcoin_units::result::NumOpError
 impl core::marker::Sync for bitcoin_units::sequence::Sequence
 impl core::marker::Unpin for bitcoin_units::Amount
 impl core::marker::Unpin for bitcoin_units::BlockTime
 impl core::marker::Unpin for bitcoin_units::FeeRate
-impl core::marker::Unpin for bitcoin_units::MathOp
-impl core::marker::Unpin for bitcoin_units::NumOpError
 impl core::marker::Unpin for bitcoin_units::SignedAmount
 impl core::marker::Unpin for bitcoin_units::Weight
 impl core::marker::Unpin for bitcoin_units::amount::Denomination
@@ -673,6 +671,8 @@ impl core::marker::Unpin for bitcoin_units::locktime::relative::error::TimeOverf
 impl core::marker::Unpin for bitcoin_units::parse::ParseIntError
 impl core::marker::Unpin for bitcoin_units::parse::PrefixedHexError
 impl core::marker::Unpin for bitcoin_units::parse::UnprefixedHexError
+impl core::marker::Unpin for bitcoin_units::result::MathOp
+impl core::marker::Unpin for bitcoin_units::result::NumOpError
 impl core::marker::Unpin for bitcoin_units::sequence::Sequence
 impl core::ops::arith::Add for bitcoin_units::Amount
 impl core::ops::arith::Add for bitcoin_units::FeeRate
@@ -682,20 +682,16 @@ impl core::ops::arith::Add for bitcoin_units::block::BlockHeightInterval
 impl core::ops::arith::Add for bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Add<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Add<&bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl core::ops::arith::Add<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Add<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<&bitcoin_units::Weight> for bitcoin_units::Weight
 impl core::ops::arith::Add<&bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeight
 impl core::ops::arith::Add<&bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeightInterval
 impl core::ops::arith::Add<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Add<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl core::ops::arith::Add<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Add<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Add<bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Add<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Add<bitcoin_units::Weight> for &bitcoin_units::Weight
 impl core::ops::arith::Add<bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeight
@@ -704,6 +700,10 @@ impl core::ops::arith::Add<bitcoin_units::block::BlockHeightInterval> for bitcoi
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Add<bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
+impl core::ops::arith::Add<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::AddAssign for bitcoin_units::FeeRate
 impl core::ops::arith::AddAssign for bitcoin_units::Weight
 impl core::ops::arith::AddAssign for bitcoin_units::block::BlockHeightInterval
@@ -717,43 +717,43 @@ impl core::ops::arith::Div for bitcoin_units::SignedAmount
 impl core::ops::arith::Div for bitcoin_units::Weight
 impl core::ops::arith::Div<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::Amount
-impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::Weight
+impl core::ops::arith::Div<&bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
+impl core::ops::arith::Div<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<i64>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::Amount
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::FeeRate
 impl core::ops::arith::Div<&core::num::nonzero::NonZero<u64>> for bitcoin_units::Weight
-impl core::ops::arith::Div<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Div<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Div<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Div<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::Weight
+impl core::ops::arith::Div<bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::Amount
-impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::Amount
+impl core::ops::arith::Div<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<core::num::nonzero::NonZero<i64>> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<i64>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for &bitcoin_units::Amount
@@ -762,99 +762,99 @@ impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for &bitcoin_units:
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::Amount
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::FeeRate
 impl core::ops::arith::Div<core::num::nonzero::NonZero<u64>> for bitcoin_units::Weight
-impl core::ops::arith::Div<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Div<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Div<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Div<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Div<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Div<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Div<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for bitcoin_units::Amount
-impl core::ops::arith::Div<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Div<u64> for bitcoin_units::Weight
-impl core::ops::arith::DivAssign<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::DivAssign<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::DivAssign<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::DivAssign<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Div<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::DivAssign<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::DivAssign<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::DivAssign<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::DivAssign<u64> for bitcoin_units::Weight
+impl core::ops::arith::DivAssign<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<&bitcoin_units::Amount> for u64
-impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::Weight
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for u64
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for i64
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<&bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<&bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<&bitcoin_units::SignedAmount> for i64
 impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<&bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<&bitcoin_units::Weight> for u64
-impl core::ops::arith::Mul<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for u64
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for i64
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
+impl core::ops::arith::Mul<&bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Mul<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Mul<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Mul<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<bitcoin_units::Amount> for &u64
 impl core::ops::arith::Mul<bitcoin_units::Amount> for u64
-impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &u64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for u64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &i64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for i64
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::FeeRate> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl core::ops::arith::Mul<bitcoin_units::SignedAmount> for &i64
 impl core::ops::arith::Mul<bitcoin_units::SignedAmount> for i64
 impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<bitcoin_units::Weight> for &u64
 impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::FeeRate
-impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::Weight> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<bitcoin_units::Weight> for u64
-impl core::ops::arith::Mul<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &u64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for u64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::Weight
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &i64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for i64
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::FeeRate
+impl core::ops::arith::Mul<bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl core::ops::arith::Mul<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Mul<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Mul<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Mul<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Mul<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Mul<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Mul<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for bitcoin_units::Amount
-impl core::ops::arith::Mul<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Mul<u64> for bitcoin_units::Weight
-impl core::ops::arith::MulAssign<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::MulAssign<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl core::ops::arith::MulAssign<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
-impl core::ops::arith::MulAssign<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::Mul<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::MulAssign<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::MulAssign<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl core::ops::arith::MulAssign<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::MulAssign<u64> for bitcoin_units::Weight
+impl core::ops::arith::MulAssign<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Neg for bitcoin_units::SignedAmount
 impl core::ops::arith::Rem for bitcoin_units::Weight
 impl core::ops::arith::Rem<&bitcoin_units::Weight> for bitcoin_units::Weight
-impl core::ops::arith::Rem<&i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<&i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Rem<&i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<&u64> for bitcoin_units::Amount
-impl core::ops::arith::Rem<&u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<&u64> for bitcoin_units::Weight
+impl core::ops::arith::Rem<&u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<bitcoin_units::Weight> for &bitcoin_units::Weight
-impl core::ops::arith::Rem<i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<i64> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Rem<i64> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl core::ops::arith::Rem<i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<i64> for bitcoin_units::SignedAmount
+impl core::ops::arith::Rem<i64> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl core::ops::arith::Rem<u64> for &bitcoin_units::Amount
-impl core::ops::arith::Rem<u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for &bitcoin_units::Weight
+impl core::ops::arith::Rem<u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for bitcoin_units::Amount
-impl core::ops::arith::Rem<u64> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::Rem<u64> for bitcoin_units::Weight
+impl core::ops::arith::Rem<u64> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl core::ops::arith::RemAssign<u64> for bitcoin_units::Weight
 impl core::ops::arith::Sub for bitcoin_units::Amount
 impl core::ops::arith::Sub for bitcoin_units::FeeRate
@@ -866,8 +866,6 @@ impl core::ops::arith::Sub for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub for bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Sub<&bitcoin_units::Amount> for bitcoin_units::Amount
 impl core::ops::arith::Sub<&bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl core::ops::arith::Sub<&bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Sub<&bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<&bitcoin_units::SignedAmount> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<&bitcoin_units::Weight> for bitcoin_units::Weight
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockHeight> for bitcoin_units::block::BlockHeight
@@ -876,12 +874,10 @@ impl core::ops::arith::Sub<&bitcoin_units::block::BlockHeightInterval> for bitco
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtp> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<&bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::Amount> for &bitcoin_units::Amount
 impl core::ops::arith::Sub<bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
-impl core::ops::arith::Sub<bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl core::ops::arith::Sub<bitcoin_units::Weight> for &bitcoin_units::Weight
 impl core::ops::arith::Sub<bitcoin_units::block::BlockHeight> for &bitcoin_units::block::BlockHeight
@@ -892,6 +888,10 @@ impl core::ops::arith::Sub<bitcoin_units::block::BlockMtp> for &bitcoin_units::b
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
 impl core::ops::arith::Sub<bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtp
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::Amount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
+impl core::ops::arith::Sub<bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::SignedAmount
 impl core::ops::arith::SubAssign for bitcoin_units::FeeRate
 impl core::ops::arith::SubAssign for bitcoin_units::Weight
 impl core::ops::arith::SubAssign for bitcoin_units::block::BlockHeightInterval
@@ -903,8 +903,6 @@ impl core::ops::arith::SubAssign<&bitcoin_units::block::BlockMtpInterval> for bi
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::Amount
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::BlockTime
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::FeeRate
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::MathOp
-impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::NumOpError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::SignedAmount
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::Weight
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::amount::Denomination
@@ -946,12 +944,12 @@ impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::locktime::relati
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::ParseIntError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::PrefixedHexError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::parse::UnprefixedHexError
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::MathOp
+impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::NumOpError
 impl core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::sequence::Sequence
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::Amount
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::BlockTime
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::FeeRate
-impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::MathOp
-impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::NumOpError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::SignedAmount
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::Weight
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::amount::Denomination
@@ -993,6 +991,8 @@ impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::locktime::relative:
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::ParseIntError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::PrefixedHexError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::parse::UnprefixedHexError
+impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::MathOp
+impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::NumOpError
 impl core::panic::unwind_safe::UnwindSafe for bitcoin_units::sequence::Sequence
 impl core::str::traits::FromStr for bitcoin_units::Amount
 impl core::str::traits::FromStr for bitcoin_units::SignedAmount
@@ -1008,74 +1008,72 @@ impl core::str::traits::FromStr for bitcoin_units::locktime::absolute::MedianTim
 impl core::str::traits::FromStr for bitcoin_units::locktime::relative::NumberOf512Seconds
 impl core::str::traits::FromStr for bitcoin_units::locktime::relative::NumberOfBlocks
 impl core::str::traits::FromStr for bitcoin_units::sequence::Sequence
-impl<'a, T> core::ops::arith::Add<&'a T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Sub<&'a T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<'a, T> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Add<&'a T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Sub<&'a T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<'a, T> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::FeeRate> for bitcoin_units::FeeRate
-impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::Weight> for bitcoin_units::Weight
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::block::BlockHeightInterval> for bitcoin_units::block::BlockHeightInterval
 impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::block::BlockMtpInterval> for bitcoin_units::block::BlockMtpInterval
+impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::iter::traits::accum::Sum<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Add<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeight
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockHeightInterval> for &bitcoin_units::block::BlockHeightInterval
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Add<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
+impl<'a> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Add<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Div<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<i64>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::FeeRate
 impl<'a> core::ops::arith::Div<&'a core::num::nonzero::NonZero<u64>> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Div<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Div<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Amount> for &u64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &u64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::NumOpResult<bitcoin_units::Weight>
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &i64
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::FeeRate> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::SignedAmount> for &i64
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl<'a> core::ops::arith::Mul<&'a bitcoin_units::Weight> for &u64
-impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &u64
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>> for &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &i64
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::FeeRate
+impl<'a> core::ops::arith::Mul<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Weight>> for &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Mul<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Mul<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Rem<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
-impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::SignedAmount
+impl<'a> core::ops::arith::Rem<&'a i64> for &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>
 impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::Weight
+impl<'a> core::ops::arith::Rem<&'a u64> for &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::Amount> for &bitcoin_units::Amount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::FeeRate> for &bitcoin_units::FeeRate
-impl<'a> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
-impl<'a> core::ops::arith::Sub<&'a bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::SignedAmount> for &bitcoin_units::SignedAmount
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::Weight> for &bitcoin_units::Weight
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockHeight> for &bitcoin_units::block::BlockHeight
@@ -1084,39 +1082,35 @@ impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockHeightInterval> fo
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtp> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtp
 impl<'a> core::ops::arith::Sub<&'a bitcoin_units::block::BlockMtpInterval> for &bitcoin_units::block::BlockMtpInterval
-impl<T: core::clone::Clone> core::clone::Clone for bitcoin_units::NumOpResult<T>
-impl<T: core::cmp::Eq> core::cmp::Eq for bitcoin_units::NumOpResult<T>
-impl<T: core::cmp::PartialEq> core::cmp::PartialEq for bitcoin_units::NumOpResult<T>
-impl<T: core::fmt::Debug> bitcoin_units::NumOpResult<T>
-impl<T: core::fmt::Debug> core::fmt::Debug for bitcoin_units::NumOpResult<T>
-impl<T: core::marker::Copy> core::marker::Copy for bitcoin_units::NumOpResult<T>
-impl<T> bitcoin_units::NumOpResult<T>
-impl<T> core::marker::Freeze for bitcoin_units::NumOpResult<T> where T: core::marker::Freeze
-impl<T> core::marker::Send for bitcoin_units::NumOpResult<T> where T: core::marker::Send
-impl<T> core::marker::StructuralPartialEq for bitcoin_units::NumOpResult<T>
-impl<T> core::marker::Sync for bitcoin_units::NumOpResult<T> where T: core::marker::Sync
-impl<T> core::marker::Unpin for bitcoin_units::NumOpResult<T> where T: core::marker::Unpin
-impl<T> core::ops::arith::Add for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<&T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<&bitcoin_units::NumOpResult<T>> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::NumOpResult<T>, Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Add<bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<&T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<&bitcoin_units::NumOpResult<T>> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<T> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<T> for bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::ops::arith::Sub<bitcoin_units::NumOpResult<T>> for &bitcoin_units::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::NumOpResult<T>>
-impl<T> core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::NumOpResult<T> where T: core::panic::unwind_safe::RefUnwindSafe
-impl<T> core::panic::unwind_safe::UnwindSafe for bitcoin_units::NumOpResult<T> where T: core::panic::unwind_safe::UnwindSafe
-pub bitcoin_units::MathOp::Add
-pub bitcoin_units::MathOp::Div
-pub bitcoin_units::MathOp::Mul
-pub bitcoin_units::MathOp::Neg
-pub bitcoin_units::MathOp::Rem
-pub bitcoin_units::MathOp::Sub
-pub bitcoin_units::NumOpResult::Error(bitcoin_units::NumOpError)
+impl<'a> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<bitcoin_units::Amount>> for &bitcoin_units::Amount
+impl<'a> core::ops::arith::Sub<&'a bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>> for &bitcoin_units::SignedAmount
+impl<T: core::clone::Clone> core::clone::Clone for bitcoin_units::result::NumOpResult<T>
+impl<T: core::cmp::Eq> core::cmp::Eq for bitcoin_units::result::NumOpResult<T>
+impl<T: core::cmp::PartialEq> core::cmp::PartialEq for bitcoin_units::result::NumOpResult<T>
+impl<T: core::fmt::Debug> bitcoin_units::result::NumOpResult<T>
+impl<T: core::fmt::Debug> core::fmt::Debug for bitcoin_units::result::NumOpResult<T>
+impl<T: core::marker::Copy> core::marker::Copy for bitcoin_units::result::NumOpResult<T>
+impl<T> bitcoin_units::result::NumOpResult<T>
+impl<T> core::marker::Freeze for bitcoin_units::result::NumOpResult<T> where T: core::marker::Freeze
+impl<T> core::marker::Send for bitcoin_units::result::NumOpResult<T> where T: core::marker::Send
+impl<T> core::marker::StructuralPartialEq for bitcoin_units::result::NumOpResult<T>
+impl<T> core::marker::Sync for bitcoin_units::result::NumOpResult<T> where T: core::marker::Sync
+impl<T> core::marker::Unpin for bitcoin_units::result::NumOpResult<T> where T: core::marker::Unpin
+impl<T> core::ops::arith::Add for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<&T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<&bitcoin_units::result::NumOpResult<T>> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>, Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Add<bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Add<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<&T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<&bitcoin_units::result::NumOpResult<T>> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<T> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<T> for bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::ops::arith::Sub<bitcoin_units::result::NumOpResult<T>> for &bitcoin_units::result::NumOpResult<T> where T: core::marker::Copy + core::ops::arith::Sub<Output = bitcoin_units::result::NumOpResult<T>>
+impl<T> core::panic::unwind_safe::RefUnwindSafe for bitcoin_units::result::NumOpResult<T> where T: core::panic::unwind_safe::RefUnwindSafe
+impl<T> core::panic::unwind_safe::UnwindSafe for bitcoin_units::result::NumOpResult<T> where T: core::panic::unwind_safe::UnwindSafe
+pub bitcoin_units::NumOpResult::Error(bitcoin_units::result::NumOpError)
 pub bitcoin_units::NumOpResult::Valid(T)
 pub bitcoin_units::absolute::LockTime::Blocks(bitcoin_units::locktime::absolute::Height)
 pub bitcoin_units::absolute::LockTime::Seconds(bitcoin_units::locktime::absolute::MedianTimePast)
@@ -1158,6 +1152,14 @@ pub bitcoin_units::relative::error::IsSatisfiedByHeightError::Incompatible(bitco
 pub bitcoin_units::relative::error::IsSatisfiedByHeightError::Satisfaction(bitcoin_units::locktime::relative::error::InvalidHeightError)
 pub bitcoin_units::relative::error::IsSatisfiedByTimeError::Incompatible(bitcoin_units::locktime::relative::NumberOfBlocks)
 pub bitcoin_units::relative::error::IsSatisfiedByTimeError::Satisfaction(bitcoin_units::locktime::relative::error::InvalidTimeError)
+pub bitcoin_units::result::MathOp::Add
+pub bitcoin_units::result::MathOp::Div
+pub bitcoin_units::result::MathOp::Mul
+pub bitcoin_units::result::MathOp::Neg
+pub bitcoin_units::result::MathOp::Rem
+pub bitcoin_units::result::MathOp::Sub
+pub bitcoin_units::result::NumOpResult::Error(bitcoin_units::result::NumOpError)
+pub bitcoin_units::result::NumOpResult::Valid(T)
 pub const bitcoin_units::Amount::FIFTY_BTC: Self
 pub const bitcoin_units::Amount::MAX: Self
 pub const bitcoin_units::Amount::MAX_MONEY: Self
@@ -1228,10 +1230,10 @@ pub const fn bitcoin_units::Amount::checked_div(self, rhs: u64) -> core::option:
 pub const fn bitcoin_units::Amount::checked_mul(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::Amount::checked_rem(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::Amount::checked_sub(self, rhs: Self) -> core::option::Option<Self>
-pub const fn bitcoin_units::Amount::div_by_fee_rate_ceil(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub const fn bitcoin_units::Amount::div_by_fee_rate_floor(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Weight>
-pub const fn bitcoin_units::Amount::div_by_weight_ceil(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
-pub const fn bitcoin_units::Amount::div_by_weight_floor(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::FeeRate>
+pub const fn bitcoin_units::Amount::div_by_fee_rate_ceil(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub const fn bitcoin_units::Amount::div_by_fee_rate_floor(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Weight>
+pub const fn bitcoin_units::Amount::div_by_weight_ceil(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
+pub const fn bitcoin_units::Amount::div_by_weight_floor(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>
 pub const fn bitcoin_units::Amount::from_btc_u16(whole_bitcoin: u16) -> Self
 pub const fn bitcoin_units::Amount::from_sat(satoshi: u64) -> core::result::Result<Self, bitcoin_units::amount::OutOfRangeError>
 pub const fn bitcoin_units::Amount::from_sat_u32(satoshi: u32) -> Self
@@ -1242,13 +1244,13 @@ pub const fn bitcoin_units::FeeRate::checked_add(self, rhs: bitcoin_units::FeeRa
 pub const fn bitcoin_units::FeeRate::checked_div(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::FeeRate::checked_mul(self, rhs: u64) -> core::option::Option<Self>
 pub const fn bitcoin_units::FeeRate::checked_sub(self, rhs: bitcoin_units::FeeRate) -> core::option::Option<Self>
-pub const fn bitcoin_units::FeeRate::from_per_kvb(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
-pub const fn bitcoin_units::FeeRate::from_per_kwu(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
-pub const fn bitcoin_units::FeeRate::from_per_vb(rate: bitcoin_units::Amount) -> bitcoin_units::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_kvb(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_kwu(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
+pub const fn bitcoin_units::FeeRate::from_per_vb(rate: bitcoin_units::Amount) -> bitcoin_units::result::NumOpResult<Self>
 pub const fn bitcoin_units::FeeRate::from_sat_per_kvb(sat_kvb: u32) -> Self
 pub const fn bitcoin_units::FeeRate::from_sat_per_kwu(sat_kwu: u32) -> Self
 pub const fn bitcoin_units::FeeRate::from_sat_per_vb(sat_vb: u32) -> Self
-pub const fn bitcoin_units::FeeRate::mul_by_weight(self, weight: bitcoin_units::Weight) -> bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub const fn bitcoin_units::FeeRate::mul_by_weight(self, weight: bitcoin_units::Weight) -> bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub const fn bitcoin_units::FeeRate::to_fee(self, weight: bitcoin_units::Weight) -> bitcoin_units::Amount
 pub const fn bitcoin_units::FeeRate::to_sat_per_kvb_ceil(self) -> u64
 pub const fn bitcoin_units::FeeRate::to_sat_per_kvb_floor(self) -> u64
@@ -1278,7 +1280,7 @@ pub const fn bitcoin_units::Weight::from_vb_unchecked(vb: u64) -> Self
 pub const fn bitcoin_units::Weight::from_vb_unwrap(vb: u64) -> bitcoin_units::Weight
 pub const fn bitcoin_units::Weight::from_witness_data_size(witness_size: u64) -> Self
 pub const fn bitcoin_units::Weight::from_wu(wu: u64) -> Self
-pub const fn bitcoin_units::Weight::mul_by_fee_rate(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::NumOpResult<bitcoin_units::Amount>
+pub const fn bitcoin_units::Weight::mul_by_fee_rate(self, fee_rate: bitcoin_units::FeeRate) -> bitcoin_units::result::NumOpResult<bitcoin_units::Amount>
 pub const fn bitcoin_units::Weight::to_kwu_ceil(self) -> u64
 pub const fn bitcoin_units::Weight::to_kwu_floor(self) -> u64
 pub const fn bitcoin_units::Weight::to_vbytes_ceil(self) -> u64
@@ -1338,22 +1340,23 @@ pub enum bitcoin_units::relative::LockTime
 pub enum bitcoin_units::relative::error::IsSatisfiedByError
 pub enum bitcoin_units::relative::error::IsSatisfiedByHeightError
 pub enum bitcoin_units::relative::error::IsSatisfiedByTimeError
+pub enum bitcoin_units::result::NumOpResult<T>
 pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Amount) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::Amount) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Amount::div(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::mul(self, rhs: &u64) -> Self::Output
@@ -1361,59 +1364,23 @@ pub fn &bitcoin_units::Amount::mul(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::rem(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Amount::rem(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn &bitcoin_units::Amount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::add(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::add(self, rhs: bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::FeeRate::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
-pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn &bitcoin_units::FeeRate::sub(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn &bitcoin_units::FeeRate::sub(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::add(self, rhs: bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: &bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<T>::sub(self, rhs: bitcoin_units::NumOpResult<T>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: u64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &core::num::nonzero::NonZeroI64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::div(self, rhs: &i64) -> Self::Output
@@ -1424,10 +1391,10 @@ pub fn &bitcoin_units::SignedAmount::mul(self, rhs: &i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::mul(self, rhs: i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::rem(self, rhs: &i64) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::rem(self, rhs: i64) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &bitcoin_units::Weight::add(self, rhs: &bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::add(self, rhs: bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
@@ -1437,10 +1404,10 @@ pub fn &bitcoin_units::Weight::div(self, rhs: bitcoin_units::Weight) -> Self::Ou
 pub fn &bitcoin_units::Weight::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn &bitcoin_units::Weight::div(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Weight::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: &u64) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::Weight::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &bitcoin_units::Weight::mul(self, rhs: u64) -> Self::Output
 pub fn &bitcoin_units::Weight::rem(self, rhs: &bitcoin_units::Weight) -> Self::Output
 pub fn &bitcoin_units::Weight::rem(self, rhs: &u64) -> Self::Output
@@ -1468,20 +1435,56 @@ pub fn &bitcoin_units::block::BlockMtpInterval::add(self, rhs: &bitcoin_units::b
 pub fn &bitcoin_units::block::BlockMtpInterval::add(self, rhs: bitcoin_units::block::BlockMtpInterval) -> Self::Output
 pub fn &bitcoin_units::block::BlockMtpInterval::sub(self, rhs: &bitcoin_units::block::BlockMtpInterval) -> Self::Output
 pub fn &bitcoin_units::block::BlockMtpInterval::sub(self, rhs: bitcoin_units::block::BlockMtpInterval) -> Self::Output
-pub fn &i64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::add(self, rhs: bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: &bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: T) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<T>::sub(self, rhs: bitcoin_units::result::NumOpResult<T>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::div(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::mul(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: &u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>::rem(self, rhs: u64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::div(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::mul(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: &i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>::rem(self, rhs: i64) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::FeeRate) -> Self::Output
+pub fn &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
 pub fn &i64::mul(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output
-pub fn &i64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
+pub fn &i64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &i64::mul(self, rhs: bitcoin_units::SignedAmount) -> Self::Output
+pub fn &i64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::SignedAmount>) -> Self::Output
 pub fn &u64::mul(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn &u64::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn &u64::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn &u64::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn &u64::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn &u64::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::add(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::add(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::clone(&self) -> bitcoin_units::Amount
 pub fn bitcoin_units::Amount::cmp(&self, other: &bitcoin_units::Amount) -> core::cmp::Ordering
 pub fn bitcoin_units::Amount::default() -> Self
@@ -1489,16 +1492,16 @@ pub fn bitcoin_units::Amount::display_dynamic(self) -> bitcoin_units::amount::Di
 pub fn bitcoin_units::Amount::display_in(self, denomination: bitcoin_units::amount::Denomination) -> bitcoin_units::amount::Display
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Amount) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: &u64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::Amount) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::FeeRate) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
-pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::FeeRate>) -> Self::Output
+pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: core::num::nonzero::NonZeroU64) -> Self::Output
 pub fn bitcoin_units::Amount::div(self, rhs: u64) -> Self::Output
 pub fn bitcoin_units::Amount::eq(&self, other: &bitcoin_units::Amount) -> bool
@@ -1517,9 +1520,9 @@ pub fn bitcoin_units::Amount::rem(self, modulus: u64) -> Self::Output
 pub fn bitcoin_units::Amount::rem(self, rhs: &u64) -> Self::Output
 pub fn bitcoin_units::Amount::signed_sub(self, rhs: bitcoin_units::Amount) -> bitcoin_units::SignedAmount
 pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::Amount) -> Self::Output
-pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Amount>) -> Self::Output
+pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Amount>) -> Self::Output
 pub fn bitcoin_units::Amount::to_btc(self) -> f64
 pub fn bitcoin_units::Amount::to_float_in(self, denom: bitcoin_units::amount::Denomination) -> f64
 pub fn bitcoin_units::Amount::to_signed(self) -> bitcoin_units::SignedAmount
@@ -1546,10 +1549,10 @@ pub fn bitcoin_units::FeeRate::fee_vb(self, vb: u64) -> core::option::Option<bit
 pub fn bitcoin_units::FeeRate::fee_wu(self, weight: bitcoin_units::Weight) -> core::option::Option<bitcoin_units::Amount>
 pub fn bitcoin_units::FeeRate::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 pub fn bitcoin_units::FeeRate::hash<__H: core::hash::Hasher>(&self, state: &mut __H)
-pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::Weight) -> Self::Output
-pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::NumOpResult<bitcoin_units::Weight>) -> Self::Output
+pub fn bitcoin_units::FeeRate::mul(self, rhs: &bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::Weight) -> Self::Output
+pub fn bitcoin_units::FeeRate::mul(self, rhs: bitcoin_units::result::NumOpResult<bitcoin_units::Weight>) -> Self::Output
 pub fn bitcoin_units::FeeRate::partial_cmp(&self, other: &bitcoin_units::FeeRate) -> core::option::Option<core::cmp::Ordering>
 pub fn bitcoin_units::FeeRate::sub(self, rhs: &bitcoin_units::FeeRate) -> Self::Output
 pub fn bitcoin_units::FeeRate::sub(self, rhs: bitcoin_units::FeeRate) -> Self::Output
@@ -1557,91 +1560,10 @@ pub fn bitcoin_units::FeeRate::sub_assign(&mut self, rhs: &bitcoin_units::FeeRat
 pub fn bitcoin_units::FeeRate::sub_assign(&mut self, rhs: bitcoin_units::FeeRate)
 pub fn bitcoin_units::FeeRate::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = &'a bitcoin_units::FeeRate>
 pub fn bitcoin_units::FeeRate::sum<I>(iter: I) -> Self where I: core::iter::traits::iterator::Iterator<Item = Self>
-pub fn bitcoin_units::MathOp::clone(&self) -> bitcoin_units::MathOp
-pub fn bitcoin_units::MathOp::eq(&self, other: &bitcoin_units::MathOp) -> bool
-pub fn bitcoin_units::MathOp::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin_units::MathOp::is_addition(self) -> bool
-pub fn bitcoin_units::MathOp::is_div_by_zero(self) -> bool
-pub fn bitcoin_units::MathOp::is_multiplication(self) -> bool
-pub fn bitcoin_units::MathOp::is_negation(self) -> bool
-pub fn bitcoin_units::MathOp::is_overflow(self) -> bool
-pub fn bitcoin_units::MathOp::is_subtraction(self) -> bool
-pub fn bitcoin_units::NumOpError::clone(&self) -> bitcoin_units::NumOpError
-pub fn bitcoin_units::NumOpError::eq(&self, other: &bitcoin_units::NumOpError) -> bool
-pub fn bitcoin_units::NumOpError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
-pub fn bitcoin_units::NumOpError::is_div_by_zero(self) -> bool
-pub fn bitcoin_units::NumOpError::is_overflow(self) -> bool
-pub fn bitcoin_units::NumOpError::operation(self) -> bitcoin_units::MathOp
-pub fn bitcoin_units::NumOpResult<T>::add(self, rhs: &T) -> Self::Output
-pub fn bitcoin_un
Risk score
Why this scored 15/100

Our methodology →
Potential impact 0/30
Exploitability 0/25
Stealth signal 0/15
Affected reach 0/15
Confidence 10/10
Evidence quality 5/5
Human-validated context
Community notes

Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.
What the developer wrote

What changed, and why it matters

Security signals we found

Evidence from the diff

Changed components

Why this scored 15/100

Community notes

Related watches

Merge rust-bitcoin/rust-bitcoin#6671: units: reword docs from height to count in relative locktime

Merge rust-bitcoin/rust-bitcoin#6670: ci: fix labeller permissions

Merge rust-bitcoin/rust-bitcoin#6657: Release tracking PR: `base58ck 0.5.0`
