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

Merge rust-bitcoin/rust-bitcoin#3403: Refine `Sequence` and `Version` `Arbitrary` impls 

9d9872711f Refine Sequence and Version Arbitrary impls (Shing Him Ng)

Pull request description:

  Refine `Sequence` and `Version` `Arbitrary` impls with an equal weighting for special cases and the arbitrary case

  Idea originally posted here: https://github.com/rust-bitcoin/rust-bitcoin/pull/3363#issuecomment-2352946108

ACKs for top commit:
  tcharding:
    ACK 9d9872711f
  apoelstra:
    ACK 9d9872711f successfully ran local tests

Tree-SHA512: 3274e4423515009187abc5d7e8dd0390b2fe4295c674ae4d784981fa2ac698f63ee69453ecbb9d6d36d6ff421753b38f7148fa41b11bc5460673a603ccfeb8c5
This commit is contained in:
merge-script 2024-09-27 14:25:00 +00:00
parent be4dffbb5b 9d9872711f
commit 02a4538c21
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
primitives/src/sequence.rs
View File

@ -244,7 +244,27 @@ units::impl_parse_str_from_int_infallible!(Sequence, u32, from_consensus);
#[cfg(feature = "arbitrary")]
impl<'a> Arbitrary<'a> for Sequence {
fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
let s = u32::arbitrary(u)?;
Ok(Sequence(s))
let mut choice_range = 4;
if cfg!(feature = "alloc") {
choice_range = 8;
}
// Equally weight the cases of meaningful sequence numbers
let choice = u.int_in_range(0..=choice_range)?;
match choice {
0 => Ok(Sequence::MAX),
1 => Ok(Sequence::ZERO),
2 => Ok(Sequence::MIN_NO_RBF),
3 => Ok(Sequence::ENABLE_RBF_NO_LOCKTIME),
#[cfg(feature = "alloc")]
4 => Ok(Sequence::from_consensus(relative::Height::MIN.to_consensus_u32())),
#[cfg(feature = "alloc")]
5 => Ok(Sequence::from_consensus(relative::Height::MAX.to_consensus_u32())),
#[cfg(feature = "alloc")]
6 => Ok(Sequence::from_consensus(relative::Time::MIN.to_consensus_u32())),
#[cfg(feature = "alloc")]
7 => Ok(Sequence::from_consensus(relative::Time::MAX.to_consensus_u32())),
_ => Ok(Sequence(u.arbitrary()?))
}
}
}

9
primitives/src/transaction.rs
View File

@ -76,8 +76,13 @@ impl fmt::Display for Version {
#[cfg(feature = "arbitrary")]
impl<'a> Arbitrary<'a> for Version {
fn arbitrary(u: &mut Unstructured<'a>) -> arbitrary::Result<Self> {
let v = i32::arbitrary(u)?;
Ok(Version(v))
// Equally weight the case of normal version numbers
let choice = u.int_in_range(0..=2)?;
match choice {
0 => Ok(Version::ONE),
1 => Ok(Version::TWO),
_ => Ok(Version(u.arbitrary()?))
}
}
}