From 6f37be8162f0d1185442c849c831f686a43802f8 Mon Sep 17 00:00:00 2001 From: Daksh Date: Fri, 7 Jun 2024 00:25:45 -0400 Subject: [PATCH] Use array --- rust-toolchain | 2 +- src/compat/crypto.rs | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/rust-toolchain b/rust-toolchain index 04cce2b..bf867e0 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2024-06-04 +nightly diff --git a/src/compat/crypto.rs b/src/compat/crypto.rs index 9ccff82..1afabbf 100644 --- a/src/compat/crypto.rs +++ b/src/compat/crypto.rs @@ -10,7 +10,7 @@ use dusk_bls12_381::BlsScalar; use dusk_bytes::Serializable; use phoenix_core::{ transaction::{ArchivedTreeLeaf, TreeLeaf}, - Note, PublicKey, + Note, PublicKey, SecretKey, ViewKey, }; use alloc::{string::ToString, vec::Vec}; @@ -48,16 +48,10 @@ pub fn check_note_ownership(args: i32, len: i32) -> i64 { let mut nullifiers = Vec::new(); let mut block_heights = Vec::new(); let mut public_spend_keys = Vec::new(); - let mut view_keys = Vec::with_capacity(MAX_KEY); - let mut secret_keys = Vec::with_capacity(MAX_KEY); - - for idx in 0..MAX_KEY { - let idx = idx as u64; - let view_key = key::derive_vk(&seed, idx); - let sk = key::derive_sk(&seed, idx as _); - view_keys.push(view_key); - secret_keys.push(sk); - } + let view_keys: [ViewKey; MAX_KEY] = + core::array::from_fn(|i| key::derive_vk(&seed, i as _)); + let secret_keys: [SecretKey; MAX_KEY] = + core::array::from_fn(|i| key::derive_sk(&seed, i as _)); for leaf_bytes in leaf_chunk.by_ref() { let TreeLeaf { block_height, note } = match rkyv::from_bytes(leaf_bytes)