From 00a3120c7bfd0343b3cf423f392ce63695d07b2a Mon Sep 17 00:00:00 2001 From: Arya Date: Thu, 14 Mar 2024 07:54:01 -0400 Subject: [PATCH] minor/trivial cleanup (#8348) --- zebra-chain/src/parameters/network/tests/prop.rs | 2 -- zebra-consensus/src/parameters/subsidy.rs | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/zebra-chain/src/parameters/network/tests/prop.rs b/zebra-chain/src/parameters/network/tests/prop.rs index 605f9790..8fd495d1 100644 --- a/zebra-chain/src/parameters/network/tests/prop.rs +++ b/zebra-chain/src/parameters/network/tests/prop.rs @@ -35,7 +35,5 @@ proptest! { assert!(Network::Mainnet.is_max_block_time_enforced(height)); assert_eq!(Network::Testnet.is_max_block_time_enforced(height), TESTNET_MAX_TIME_START_HEIGHT <= height); - - } } diff --git a/zebra-consensus/src/parameters/subsidy.rs b/zebra-consensus/src/parameters/subsidy.rs index 50dd78d8..1b12a52f 100644 --- a/zebra-consensus/src/parameters/subsidy.rs +++ b/zebra-consensus/src/parameters/subsidy.rs @@ -201,12 +201,12 @@ pub const FUNDING_STREAM_ECC_ADDRESSES_MAINNET: [&str; FUNDING_STREAMS_NUM_ADDRE /// Functionality specific to block subsidy-related consensus rules pub trait ParameterSubsidy { /// Number of addresses for each funding stream in the Network. - /// [7.10]: https://zips.z.cash/protocol/protocol.pdf#fundingstreams + /// [7.10]: fn num_funding_streams(&self) -> usize; /// Returns the minimum height after the first halving /// as described in [protocol specification ยง7.10][7.10] /// - /// [7.10]: https://zips.z.cash/protocol/protocol.pdf#fundingstreams + /// [7.10]: fn height_for_first_halving(&self) -> Height; } @@ -221,7 +221,7 @@ impl ParameterSubsidy for Network { fn height_for_first_halving(&self) -> Height { // First halving on Mainnet is at Canopy // while in Testnet is at block constant height of `1_116_000` - // https://zips.z.cash/protocol/protocol.pdf#zip214fundingstreams + // match self { Network::Mainnet => NetworkUpgrade::Canopy .activation_height(*self)