From e85359c7560140e1cb4801a019b357dd919a569a Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Sun, 14 Mar 2021 05:56:38 -0400 Subject: [PATCH] Orchard: tidy --- zebra-chain/src/orchard/keys.rs | 6 ++++++ zebra-chain/src/orchard/sinsemilla.rs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/zebra-chain/src/orchard/keys.rs b/zebra-chain/src/orchard/keys.rs index 86fce2ab0..ad0787c2d 100644 --- a/zebra-chain/src/orchard/keys.rs +++ b/zebra-chain/src/orchard/keys.rs @@ -143,6 +143,12 @@ impl From<[u8; 32]> for SpendingKey { } } +impl From for [u8; 32] { + fn from(sk: SpendingKey) -> Self { + sk.bytes + } +} + impl fmt::Display for SpendingKey { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let hrp = match self.network { diff --git a/zebra-chain/src/orchard/sinsemilla.rs b/zebra-chain/src/orchard/sinsemilla.rs index c1a334f4c..5b5c52ffd 100644 --- a/zebra-chain/src/orchard/sinsemilla.rs +++ b/zebra-chain/src/orchard/sinsemilla.rs @@ -87,7 +87,7 @@ pub fn sinsemilla_hash_to_point(D: &[u8], M: &BitVec) -> pallas::Point .for_each(|(i, bit)| bits.set(i, *bit)); // An instance of LEBS2IP_k - let j = &bits.iter().fold(0u16, |j, &bit| j * *2 + bit as u16); + let j = &bits.iter().fold(0u16, |j, &bit| j * 2 + bit as u16); acc += acc + S(j.to_le_bytes()); }