Skip to content

Commit

Permalink
Revert "Use correct Nu7 branch_id"
Browse files Browse the repository at this point in the history
This reverts commit f33189f.
  • Loading branch information
alexeykoren committed Dec 16, 2024
1 parent 28061b3 commit 387c5d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions components/zcash_protocol/src/consensus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ impl TryFrom<u32> for BranchId {
#[cfg(zcash_unstable = "nu6")]
0xc8e7_1055 => Ok(BranchId::Nu6),
#[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
0x7719_0ad8 => Ok(BranchId::Nu7),
0x7777_7777 => Ok(BranchId::Nu7),
#[cfg(zcash_unstable = "zfuture")]
0xffff_ffff => Ok(BranchId::ZFuture),
_ => Err("Unknown consensus branch ID"),
Expand All @@ -647,7 +647,7 @@ impl From<BranchId> for u32 {
#[cfg(zcash_unstable = "nu6")]
BranchId::Nu6 => 0xc8e7_1055,
#[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
BranchId::Nu7 => 0x7719_0ad8,
BranchId::Nu7 => 0x7777_7777,
#[cfg(zcash_unstable = "zfuture")]
BranchId::ZFuture => 0xffff_ffff,
}
Expand Down

0 comments on commit 387c5d8

Please sign in to comment.