From 7f60f0f881e6f24e6dade62a5534f7acc3112888 Mon Sep 17 00:00:00 2001 From: Aditya Kulkarni Date: Wed, 10 Jul 2019 11:07:22 -0700 Subject: [PATCH] Make some methods in DiversifierKey, DiversiferIndex pub --- zcash_primitives/src/zip32.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zcash_primitives/src/zip32.rs b/zcash_primitives/src/zip32.rs index db5adcd..54f386d 100644 --- a/zcash_primitives/src/zip32.rs +++ b/zcash_primitives/src/zip32.rs @@ -94,7 +94,7 @@ struct ChainCode([u8; 32]); pub struct DiversifierIndex(pub [u8; 11]); impl DiversifierIndex { - fn new() -> Self { + pub fn new() -> Self { DiversifierIndex([0; 11]) } @@ -113,10 +113,10 @@ impl DiversifierIndex { /// A key used to derive diversifiers for a particular child key #[derive(Clone, Copy, Debug, PartialEq)] -struct DiversifierKey([u8; 32]); +pub struct DiversifierKey(pub [u8; 32]); impl DiversifierKey { - fn master(sk_m: &[u8]) -> Self { + pub fn master(sk_m: &[u8]) -> Self { let mut dk_m = [0u8; 32]; dk_m.copy_from_slice(&prf_expand(sk_m, &[0x10]).as_bytes()[..32]); DiversifierKey(dk_m) @@ -131,7 +131,7 @@ impl DiversifierKey { /// Returns the first index starting from j that generates a valid /// diversifier, along with the corresponding diversifier. Returns /// an error if the diversifier space is exhausted. - fn diversifier(&self, mut j: DiversifierIndex) -> Result<(DiversifierIndex, Diversifier), ()> { + pub fn diversifier(&self, mut j: DiversifierIndex) -> Result<(DiversifierIndex, Diversifier), ()> { let ff = FF1::::new(&self.0, 2).unwrap(); loop { // Generate d_j