Use full paths for types from `zcash_primitives`
Upcoming commits will use `zcash_protocol::consensus::Parameters`, which would make names such as `zp_consensus::Parameters` ambiguous since such a name could stand for both `zcash_primitives...` and `zcash_protocol...`.
This commit is contained in:
parent
2ba837470e
commit
09920d045e
|
@ -4,8 +4,6 @@ use std::{fmt, str::FromStr, sync::Arc};
|
||||||
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
use zcash_primitives::{consensus as zp_consensus, constants as zp_constants};
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
block::{self, Height, HeightDiff},
|
block::{self, Height, HeightDiff},
|
||||||
parameters::NetworkUpgrade,
|
parameters::NetworkUpgrade,
|
||||||
|
@ -94,8 +92,10 @@ impl NetworkKind {
|
||||||
/// pay-to-public-key-hash payment addresses for the network.
|
/// pay-to-public-key-hash payment addresses for the network.
|
||||||
pub fn b58_pubkey_address_prefix(self) -> [u8; 2] {
|
pub fn b58_pubkey_address_prefix(self) -> [u8; 2] {
|
||||||
match self {
|
match self {
|
||||||
Self::Mainnet => zp_constants::mainnet::B58_PUBKEY_ADDRESS_PREFIX,
|
Self::Mainnet => zcash_primitives::constants::mainnet::B58_PUBKEY_ADDRESS_PREFIX,
|
||||||
Self::Testnet | Self::Regtest => zp_constants::testnet::B58_PUBKEY_ADDRESS_PREFIX,
|
Self::Testnet | Self::Regtest => {
|
||||||
|
zcash_primitives::constants::testnet::B58_PUBKEY_ADDRESS_PREFIX
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -103,8 +103,10 @@ impl NetworkKind {
|
||||||
/// payment addresses for the network.
|
/// payment addresses for the network.
|
||||||
pub fn b58_script_address_prefix(self) -> [u8; 2] {
|
pub fn b58_script_address_prefix(self) -> [u8; 2] {
|
||||||
match self {
|
match self {
|
||||||
Self::Mainnet => zp_constants::mainnet::B58_SCRIPT_ADDRESS_PREFIX,
|
Self::Mainnet => zcash_primitives::constants::mainnet::B58_SCRIPT_ADDRESS_PREFIX,
|
||||||
Self::Testnet | Self::Regtest => zp_constants::testnet::B58_SCRIPT_ADDRESS_PREFIX,
|
Self::Testnet | Self::Regtest => {
|
||||||
|
zcash_primitives::constants::testnet::B58_SCRIPT_ADDRESS_PREFIX
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -276,32 +278,32 @@ impl FromStr for Network {
|
||||||
#[error("Invalid network: {0}")]
|
#[error("Invalid network: {0}")]
|
||||||
pub struct InvalidNetworkError(String);
|
pub struct InvalidNetworkError(String);
|
||||||
|
|
||||||
impl zp_consensus::Parameters for Network {
|
impl zcash_primitives::consensus::Parameters for Network {
|
||||||
fn activation_height(
|
fn activation_height(
|
||||||
&self,
|
&self,
|
||||||
nu: zcash_primitives::consensus::NetworkUpgrade,
|
nu: zcash_primitives::consensus::NetworkUpgrade,
|
||||||
) -> Option<zcash_primitives::consensus::BlockHeight> {
|
) -> Option<zcash_primitives::consensus::BlockHeight> {
|
||||||
let target_nu = match nu {
|
let target_nu = match nu {
|
||||||
zp_consensus::NetworkUpgrade::Overwinter => NetworkUpgrade::Overwinter,
|
zcash_primitives::consensus::NetworkUpgrade::Overwinter => NetworkUpgrade::Overwinter,
|
||||||
zp_consensus::NetworkUpgrade::Sapling => NetworkUpgrade::Sapling,
|
zcash_primitives::consensus::NetworkUpgrade::Sapling => NetworkUpgrade::Sapling,
|
||||||
zp_consensus::NetworkUpgrade::Blossom => NetworkUpgrade::Blossom,
|
zcash_primitives::consensus::NetworkUpgrade::Blossom => NetworkUpgrade::Blossom,
|
||||||
zp_consensus::NetworkUpgrade::Heartwood => NetworkUpgrade::Heartwood,
|
zcash_primitives::consensus::NetworkUpgrade::Heartwood => NetworkUpgrade::Heartwood,
|
||||||
zp_consensus::NetworkUpgrade::Canopy => NetworkUpgrade::Canopy,
|
zcash_primitives::consensus::NetworkUpgrade::Canopy => NetworkUpgrade::Canopy,
|
||||||
zp_consensus::NetworkUpgrade::Nu5 => NetworkUpgrade::Nu5,
|
zcash_primitives::consensus::NetworkUpgrade::Nu5 => NetworkUpgrade::Nu5,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Heights are hard-coded below Height::MAX or checked when the config is parsed.
|
// Heights are hard-coded below Height::MAX or checked when the config is parsed.
|
||||||
target_nu
|
target_nu
|
||||||
.activation_height(self)
|
.activation_height(self)
|
||||||
.map(|Height(h)| zp_consensus::BlockHeight::from_u32(h))
|
.map(|Height(h)| zcash_primitives::consensus::BlockHeight::from_u32(h))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn coin_type(&self) -> u32 {
|
fn coin_type(&self) -> u32 {
|
||||||
match self {
|
match self {
|
||||||
Network::Mainnet => zp_constants::mainnet::COIN_TYPE,
|
Network::Mainnet => zcash_primitives::constants::mainnet::COIN_TYPE,
|
||||||
// The regtest cointype reuses the testnet cointype,
|
// The regtest cointype reuses the testnet cointype,
|
||||||
// See <https://github.com/satoshilabs/slips/blob/master/slip-0044.md>
|
// See <https://github.com/satoshilabs/slips/blob/master/slip-0044.md>
|
||||||
Network::Testnet(_) => zp_constants::testnet::COIN_TYPE,
|
Network::Testnet(_) => zcash_primitives::constants::testnet::COIN_TYPE,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -315,21 +317,25 @@ impl zp_consensus::Parameters for Network {
|
||||||
|
|
||||||
fn hrp_sapling_extended_spending_key(&self) -> &str {
|
fn hrp_sapling_extended_spending_key(&self) -> &str {
|
||||||
match self {
|
match self {
|
||||||
Network::Mainnet => zp_constants::mainnet::HRP_SAPLING_EXTENDED_SPENDING_KEY,
|
Network::Mainnet => {
|
||||||
|
zcash_primitives::constants::mainnet::HRP_SAPLING_EXTENDED_SPENDING_KEY
|
||||||
|
}
|
||||||
Network::Testnet(params) => params.hrp_sapling_extended_spending_key(),
|
Network::Testnet(params) => params.hrp_sapling_extended_spending_key(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn hrp_sapling_extended_full_viewing_key(&self) -> &str {
|
fn hrp_sapling_extended_full_viewing_key(&self) -> &str {
|
||||||
match self {
|
match self {
|
||||||
Network::Mainnet => zp_constants::mainnet::HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY,
|
Network::Mainnet => {
|
||||||
|
zcash_primitives::constants::mainnet::HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY
|
||||||
|
}
|
||||||
Network::Testnet(params) => params.hrp_sapling_extended_full_viewing_key(),
|
Network::Testnet(params) => params.hrp_sapling_extended_full_viewing_key(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn hrp_sapling_payment_address(&self) -> &str {
|
fn hrp_sapling_payment_address(&self) -> &str {
|
||||||
match self {
|
match self {
|
||||||
Network::Mainnet => zp_constants::mainnet::HRP_SAPLING_PAYMENT_ADDRESS,
|
Network::Mainnet => zcash_primitives::constants::mainnet::HRP_SAPLING_PAYMENT_ADDRESS,
|
||||||
Network::Testnet(params) => params.hrp_sapling_payment_address(),
|
Network::Testnet(params) => params.hrp_sapling_payment_address(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue