From 01fed3e0f34558e23128b522c305cb5b594dd5d6 Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Thu, 11 Mar 2021 08:47:02 -0500 Subject: [PATCH] Tidy impl From for IvkCommitRandomness --- zebra-chain/src/orchard/keys.rs | 4 +++- zebra-chain/src/orchard/keys/tests.rs | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zebra-chain/src/orchard/keys.rs b/zebra-chain/src/orchard/keys.rs index 2e11f161..f1d035d2 100644 --- a/zebra-chain/src/orchard/keys.rs +++ b/zebra-chain/src/orchard/keys.rs @@ -410,7 +410,9 @@ impl From for IvkCommitRandomness { /// /// https://zips.z.cash/protocol/protocol.pdf#orchardkeycomponents fn from(sk: SpendingKey) -> Self { - Self(pallas::Scalar::from_bytes_wide(prf_expand(sk.into(), &[8]))) + let scalar = pallas::Scalar::from_bytes_wide(&prf_expand(sk.into(), &[&[8]])); + + Self(scalar) } } diff --git a/zebra-chain/src/orchard/keys/tests.rs b/zebra-chain/src/orchard/keys/tests.rs index 8b8f4322..ece24cbc 100644 --- a/zebra-chain/src/orchard/keys/tests.rs +++ b/zebra-chain/src/orchard/keys/tests.rs @@ -12,10 +12,10 @@ impl Arbitrary for TransmissionKey { (any::()) .prop_map(|spending_key| { let spend_authorizing_key = SpendAuthorizingKey::from(spending_key); - let proof_authorizing_key = ProofAuthorizingKey::from(spending_key); - let authorizing_key = AuthorizingKey::from(spend_authorizing_key); - let nullifier_deriving_key = NullifierDerivingKey::from(proof_authorizing_key); + let spend_validating_key = SpendValidatingKey::from(spending_key); + let nullifier_deriving_key = NullifierDerivingKey::from(spending_key); + let ivk_commit_randomness = IvkCommitRandomness::from(); let incoming_viewing_key = IncomingViewingKey::from((authorizing_key, nullifier_deriving_key));