Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Arya <aryasolhi@gmail.com>
  • Loading branch information
upbqdn and arya2 authored Jul 18, 2024
1 parent e6e69fb commit f998c55
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion zebra-chain/src/block/commitment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl Commitment {
}
}
// NetworkUpgrade::current() returns the latest network upgrade that's activated at the provided height, so
// on Regtest for heights above height 0, it returns NU6, and it's possible for the current network upgrade
// on Regtest for heights above height 0, it could return NU6, and it's possible for the current network upgrade
// to be NU6 (or Canopy, or any network upgrade above Heartwood) at the Heartwood activation height.
(Canopy | Nu5 | Nu6, activation_height)
if height == activation_height
Expand Down
2 changes: 0 additions & 2 deletions zebra-chain/src/transaction/arbitrary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,6 @@ impl Arbitrary for Transaction {
NetworkUpgrade::Blossom | NetworkUpgrade::Heartwood | NetworkUpgrade::Canopy => {
Self::v4_strategy(ledger_state)
}
// TODO: move `NetworkUpgrade::Nu6` to its own match arm if there's a new tx format for
// NU6 or remove this TODO if there isn't.
NetworkUpgrade::Nu5 | NetworkUpgrade::Nu6 => prop_oneof![
Self::v4_strategy(ledger_state.clone()),
Self::v5_strategy(ledger_state)
Expand Down
2 changes: 0 additions & 2 deletions zebra-consensus/src/transaction/tests/prop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,6 @@ fn sanitize_transaction_version(
BeforeOverwinter => 2,
Overwinter => 3,
Sapling | Blossom | Heartwood | Canopy => 4,
// TODO: move `Nu6` to its own match arm if there's a new tx format for NU6 or remove
// this TODO if there isn't.
Nu5 | Nu6 => 5,
}
};
Expand Down

0 comments on commit f998c55

Please sign in to comment.