diff --git a/components/zcash_protocol/src/local_consensus.rs b/components/zcash_protocol/src/local_consensus.rs index cf4dffe60..994154240 100644 --- a/components/zcash_protocol/src/local_consensus.rs +++ b/components/zcash_protocol/src/local_consensus.rs @@ -198,30 +198,25 @@ mod tests { z_future: Some(expected_z_future), }; + assert_eq!(regtest.coin_type(), constants::regtest::COIN_TYPE); assert_eq!( - regtest.network_type().coin_type(), - constants::regtest::COIN_TYPE - ); - assert_eq!( - regtest.network_type().hrp_sapling_extended_spending_key(), + regtest.hrp_sapling_extended_spending_key(), constants::regtest::HRP_SAPLING_EXTENDED_SPENDING_KEY ); assert_eq!( - regtest - .network_type() - .hrp_sapling_extended_full_viewing_key(), + regtest.hrp_sapling_extended_full_viewing_key(), constants::regtest::HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY ); assert_eq!( - regtest.network_type().hrp_sapling_payment_address(), + regtest.hrp_sapling_payment_address(), constants::regtest::HRP_SAPLING_PAYMENT_ADDRESS ); assert_eq!( - regtest.network_type().b58_pubkey_address_prefix(), + regtest.b58_pubkey_address_prefix(), constants::regtest::B58_PUBKEY_ADDRESS_PREFIX ); assert_eq!( - regtest.network_type().b58_script_address_prefix(), + regtest.b58_script_address_prefix(), constants::regtest::B58_SCRIPT_ADDRESS_PREFIX ); } diff --git a/zcash_client_sqlite/src/lib.rs b/zcash_client_sqlite/src/lib.rs index b98deb817..c0e046b05 100644 --- a/zcash_client_sqlite/src/lib.rs +++ b/zcash_client_sqlite/src/lib.rs @@ -1240,9 +1240,7 @@ mod tests { use { crate::testing::AddressType, zcash_client_backend::keys::sapling, - zcash_primitives::{ - consensus::Parameters, transaction::components::amount::NonNegativeAmount, - }, + zcash_primitives::transaction::components::amount::NonNegativeAmount, }; #[test] @@ -1341,11 +1339,7 @@ mod tests { // Generate some fake CompactBlocks. let seed = [0u8; 32]; let account = AccountId::ZERO; - let extsk = sapling::spending_key( - &seed, - st.wallet().params.network_type().coin_type(), - account, - ); + let extsk = sapling::spending_key(&seed, st.wallet().params.coin_type(), account); let dfvk = extsk.to_diversifiable_full_viewing_key(); let (h1, meta1, _) = st.generate_next_block( &dfvk, diff --git a/zcash_client_sqlite/src/wallet/init.rs b/zcash_client_sqlite/src/wallet/init.rs index 7a6b2b017..35734806d 100644 --- a/zcash_client_sqlite/src/wallet/init.rs +++ b/zcash_client_sqlite/src/wallet/init.rs @@ -712,13 +712,11 @@ mod tests { )?; let address = encode_payment_address( - wdb.params.network_type().hrp_sapling_payment_address(), + wdb.params.hrp_sapling_payment_address(), &extfvk.default_address().1, ); let extfvk = encode_extended_full_viewing_key( - wdb.params - .network_type() - .hrp_sapling_extended_full_viewing_key(), + wdb.params.hrp_sapling_extended_full_viewing_key(), extfvk, ); wdb.conn.execute( @@ -739,8 +737,7 @@ mod tests { let seed = [0xab; 32]; let account = AccountId::ZERO; - let secret_key = - sapling::spending_key(&seed, db_data.params.network_type().coin_type(), account); + let secret_key = sapling::spending_key(&seed, db_data.params.coin_type(), account); let extfvk = secret_key.to_extended_full_viewing_key(); init_0_3_0(&mut db_data, &extfvk, account).unwrap(); @@ -852,13 +849,11 @@ mod tests { )?; let address = encode_payment_address( - wdb.params.network_type().hrp_sapling_payment_address(), + wdb.params.hrp_sapling_payment_address(), &extfvk.default_address().1, ); let extfvk = encode_extended_full_viewing_key( - wdb.params - .network_type() - .hrp_sapling_extended_full_viewing_key(), + wdb.params.hrp_sapling_extended_full_viewing_key(), extfvk, ); wdb.conn.execute( @@ -913,8 +908,7 @@ mod tests { let seed = [0xab; 32]; let account = AccountId::ZERO; - let secret_key = - sapling::spending_key(&seed, db_data.params.network_type().coin_type(), account); + let secret_key = sapling::spending_key(&seed, db_data.params.coin_type(), account); let extfvk = secret_key.to_extended_full_viewing_key(); init_autoshielding(&mut db_data, &extfvk, account).unwrap(); diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs index 452988596..147b33cb1 100644 --- a/zcash_keys/src/keys.rs +++ b/zcash_keys/src/keys.rs @@ -190,11 +190,11 @@ impl UnifiedSpendingKey { transparent: legacy::AccountPrivKey::from_seed(_params, seed, _account) .map_err(DerivationError::Transparent)?, #[cfg(feature = "sapling")] - sapling: sapling::spending_key(seed, _params.network_type().coin_type(), _account), + sapling: sapling::spending_key(seed, _params.coin_type(), _account), #[cfg(feature = "orchard")] orchard: orchard::keys::SpendingKey::from_zip32_seed( seed, - _params.network_type().coin_type(), + _params.coin_type(), _account, ) .map_err(DerivationError::Orchard)?, diff --git a/zcash_primitives/src/legacy/keys.rs b/zcash_primitives/src/legacy/keys.rs index 19a12e59f..fbed55028 100644 --- a/zcash_primitives/src/legacy/keys.rs +++ b/zcash_primitives/src/legacy/keys.rs @@ -120,9 +120,7 @@ impl AccountPrivKey { ) -> Result { ExtendedPrivKey::with_seed(seed)? .derive_private_key(KeyIndex::hardened_from_normalize_index(44)?)? - .derive_private_key(KeyIndex::hardened_from_normalize_index( - params.network_type().coin_type(), - )?)? + .derive_private_key(KeyIndex::hardened_from_normalize_index(params.coin_type())?)? .derive_private_key(KeyIndex::hardened_from_normalize_index(account.into())?) .map(AccountPrivKey) }