milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#1701: Fix weight subtract bug 

b311e96603 Fix weight subtract bug (yancy)

Pull request description:

  Fix subtraction bug

ACKs for top commit:
  apoelstra:
    ACK b311e96603
  tcharding:
    ACK b311e96603
  sanket1729:
    utACK b311e96603

Tree-SHA512: 517b18432f88b501b17e8d8c9e11f6cfde76fc2c8cd7aba0afda79a4eea4a662154f4e09bb303386bcc93582921160b59642969514b6d9dce6cab62263b66b62
This commit is contained in:
Andrew Poelstra 2023-03-08 23:44:09 +00:00
parent 9ffbbb8efb b311e96603
commit 10d61f1c97
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bitcoin/src/blockdata/weight.rs
View File

@ -86,7 +86,7 @@ impl Weight {
/// ///
/// Computes `self - rhs` returning `None` if overflow occurred. /// Computes `self - rhs` returning `None` if overflow occurred.
pub fn checked_sub(self, rhs: Self) -> Option<Self> { pub fn checked_sub(self, rhs: Self) -> Option<Self> {
self.0.checked_add(rhs.0).map(Self) self.0.checked_sub(rhs.0).map(Self)
} }
/// Checked multiplication. /// Checked multiplication.
@ -115,6 +115,20 @@ impl fmt::Display for Weight {
} }
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn checked_sub_test(){
let result = Weight(1).checked_sub(Weight(1)).expect("expected weight unit");
assert_eq!(Weight::ZERO, result);
let result = Weight::MIN.checked_sub(Weight(1));
assert_eq!(None, result);
}
}
impl From<Weight> for u64 { impl From<Weight> for u64 {
fn from(value: Weight) -> Self { fn from(value: Weight) -> Self {
value.to_wu() value.to_wu()