Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse ConsensusBranchId into NetworkUpgrade for transaction v5 #2075

Merged
merged 13 commits into from
Apr 29, 2021
Merged

Parse ConsensusBranchId into NetworkUpgrade for transaction v5 #2075

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d48a2c4
add consensus_branch_id field to transaction v5
oxarbitrage Apr 27, 2021
4635408
clippy
oxarbitrage Apr 27, 2021
907d8e6
rustfmt
oxarbitrage Apr 27, 2021
0c8535a
replace consensus_branch_id with network_upgrade
oxarbitrage Apr 27, 2021
8fd1b4f
remove unintended test files
oxarbitrage Apr 27, 2021
1f74919
change method name
oxarbitrage Apr 28, 2021
8a7ba0e
some clanups
oxarbitrage Apr 28, 2021
db22c3b
add network_upgrade as a constant in tests
oxarbitrage Apr 28, 2021
f9edb7c
use std in created function
oxarbitrage Apr 28, 2021
a8e3578
add comment to manual arbitrary impl
oxarbitrage Apr 28, 2021
9a413d7
create custom strategy to deal with NetworkUpgrade
oxarbitrage Apr 28, 2021
b1ba839
Add a missing TODO comment
teor2345 Apr 29, 2021
fc9b716
Merge branch 'main' into issue2066
teor2345 Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions zebra-chain/src/transaction/arbitrary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl Transaction {
/// Generate a proptest strategy for V5 Transactions
pub fn v5_strategy(ledger_state: LedgerState) -> BoxedStrategy<Self> {
(
any::<NetworkUpgrade>(),
Self::branch_id_strategy(),
any::<LockTime>(),
any::<block::Height>(),
transparent::Input::vec_strategy(ledger_state, 10),
Expand Down Expand Up @@ -132,6 +132,19 @@ impl Transaction {
.boxed()
}

// A custom strategy to use only some of the NetworkUpgrade values
fn branch_id_strategy() -> BoxedStrategy<NetworkUpgrade> {
prop_oneof![
Just(NetworkUpgrade::Overwinter),
Just(NetworkUpgrade::Sapling),
Just(NetworkUpgrade::Blossom),
Just(NetworkUpgrade::Heartwood),
Just(NetworkUpgrade::Canopy),
Just(NetworkUpgrade::Nu5),
]
teor2345 marked this conversation as resolved.
Show resolved Hide resolved
.boxed()
}

/// Proptest Strategy for creating a Vector of transactions where the first
/// transaction is always the only coinbase transaction
pub fn vec_strategy(
Expand Down Expand Up @@ -186,26 +199,6 @@ impl Arbitrary for LockTime {
type Strategy = BoxedStrategy<Self>;
}

// We manually implement here because not all the values from the
// `NetworkUpgrade` are valid.
impl Arbitrary for NetworkUpgrade {
type Parameters = ();

fn arbitrary_with(_args: ()) -> Self::Strategy {
prop_oneof![
Just(NetworkUpgrade::Overwinter),
Just(NetworkUpgrade::Sapling),
Just(NetworkUpgrade::Blossom),
Just(NetworkUpgrade::Heartwood),
Just(NetworkUpgrade::Canopy),
Just(NetworkUpgrade::Nu5),
]
.boxed()
}

type Strategy = BoxedStrategy<Self>;
}

impl<P: ZkSnarkProof + Arbitrary + 'static> Arbitrary for JoinSplitData<P> {
type Parameters = ();

Expand Down