zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update network_upgrade.rs (#2058)

This commit is contained in:
teor 2021-04-23 23:23:43 +10:00 committed by GitHub
parent ea1446ee92
commit 9b3d56db0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra-chain/src/parameters/network_upgrade.rs
View File

@ -161,7 +161,8 @@ impl NetworkUpgrade {
/// Returns the next network upgrade for `network` and `height`. /// Returns the next network upgrade for `network` and `height`.
/// ///
/// Returns None if the name of the next upgrade has not been decided yet. /// Returns None if the next upgrade has not been implemented in Zebra
/// yet.
pub fn next(network: Network, height: block::Height) -> Option<NetworkUpgrade> { pub fn next(network: Network, height: block::Height) -> Option<NetworkUpgrade> {
NetworkUpgrade::activation_list(network) NetworkUpgrade::activation_list(network)
.range((Excluded(height), Unbounded)) .range((Excluded(height), Unbounded))
@ -224,9 +225,6 @@ impl NetworkUpgrade {
/// Returns `None` if the testnet minimum difficulty consensus rule is not active. /// Returns `None` if the testnet minimum difficulty consensus rule is not active.
/// ///
/// Based on https://zips.z.cash/zip-0208#minimum-difficulty-blocks-on-the-test-network /// Based on https://zips.z.cash/zip-0208#minimum-difficulty-blocks-on-the-test-network
///
/// `zcashd` requires a gap that's strictly greater than 6 times the target
/// threshold, but ZIP-205 and ZIP-208 are ambiguous. See bug #1276.
pub fn minimum_difficulty_spacing_for_height( pub fn minimum_difficulty_spacing_for_height(
network: Network, network: Network,
height: block::Height, height: block::Height,