diff --git a/risc0-selective-privacy-poc/examples/happy_path.rs b/risc0-selective-privacy-poc/examples/happy_path.rs index 8fdc947..b8bc0fd 100644 --- a/risc0-selective-privacy-poc/examples/happy_path.rs +++ b/risc0-selective-privacy-poc/examples/happy_path.rs @@ -1,12 +1,10 @@ use core::{ - account::Account, - bytes_to_words, hash, - types::{Address, Commitment, Key, Nullifier}, + bytes_to_words, + types::Address, visibility::InputVisibiility, }; -use nssa::program::{PinataProgram, TransferProgram}; -use risc0_zkvm::Receipt; +use nssa::program::PinataProgram; use crate::mocked_components::sequencer::{print_accounts, MockedSequencer}; use crate::mocked_components::{client::MockedClient, USER_CLIENTS}; @@ -60,7 +58,7 @@ fn main() { // All of this is executed locally by the sender let receiver_addr = USER_CLIENTS[1].user_address(); let pinata_account = sequencer.get_account(&[0xcafe; 8]).unwrap(); - let mut receiver_account = MockedClient::fresh_account_for_mint(receiver_addr); + let receiver_account = MockedClient::fresh_account_for_mint(receiver_addr); let visibilities = [InputVisibiility::Public, InputVisibiility::Private(None)]; let preimage = bytes_to_words(b"NSSA Selective privacy is great!").to_vec(); diff --git a/risc0-selective-privacy-poc/examples/mocked_components/client/mod.rs b/risc0-selective-privacy-poc/examples/mocked_components/client/mod.rs index 9bbd1f9..eb43c96 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/client/mod.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/client/mod.rs @@ -1,10 +1,9 @@ use crate::mocked_components::sequencer::MockedSequencer; use core::{ account::Account, - types::{Address, Commitment, Key, Nullifier}, + types::{Address, Key}, visibility::InputVisibiility, }; -use nssa::program::TransferProgram; pub mod transfer_deshielded; pub mod transfer_private; diff --git a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_deshielded.rs b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_deshielded.rs index 0d0bb2c..cbfce18 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_deshielded.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_deshielded.rs @@ -1,5 +1,5 @@ use core::account::Account; -use core::types::{Address, Commitment, Key, Nullifier}; +use core::types::Address; use core::visibility::InputVisibiility; use nssa::program::TransferProgram; diff --git a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_private.rs b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_private.rs index 27aca69..3c62242 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_private.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_private.rs @@ -1,5 +1,5 @@ use core::account::Account; -use core::types::{Address, Commitment, Key, Nullifier}; +use core::types::Address; use core::visibility::InputVisibiility; use nssa::program::TransferProgram; @@ -22,7 +22,7 @@ impl MockedClient { let sender_commitment_auth_path = sequencer.get_authentication_path_for(&owned_private_account.commitment()); // Create a new default private account for the recipient - let mut receiver_account = Self::fresh_account_for_mint(*to_address); + let receiver_account = Self::fresh_account_for_mint(*to_address); // Set visibilities. Both private accounts. let visibilities = vec![ diff --git a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_shielded.rs b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_shielded.rs index 9e56bba..fb2e3ea 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_shielded.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/client/transfer_shielded.rs @@ -1,5 +1,5 @@ use core::account::Account; -use core::types::{Address, Commitment, Key, Nullifier}; +use core::types::Address; use core::visibility::InputVisibiility; use nssa::program::TransferProgram; @@ -22,7 +22,7 @@ impl MockedClient { let from_account = sequencer.get_account(&self.user_address()).ok_or(())?; // Create a new default private account for the receiver - let mut to_account = Self::fresh_account_for_mint(*to_address); + let to_account = Self::fresh_account_for_mint(*to_address); // Set input visibilities // First is the public account of the sender. Second is the private account minted in this diff --git a/risc0-selective-privacy-poc/examples/mocked_components/mod.rs b/risc0-selective-privacy-poc/examples/mocked_components/mod.rs index 0f9ba62..20f37c0 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/mod.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/mod.rs @@ -1,4 +1,3 @@ -use core::types::Key; use crate::mocked_components::client::MockedClient; diff --git a/risc0-selective-privacy-poc/examples/mocked_components/sequencer/mod.rs b/risc0-selective-privacy-poc/examples/mocked_components/sequencer/mod.rs index 938942f..b6ff557 100644 --- a/risc0-selective-privacy-poc/examples/mocked_components/sequencer/mod.rs +++ b/risc0-selective-privacy-poc/examples/mocked_components/sequencer/mod.rs @@ -1,7 +1,7 @@ use core::{ account::Account, bytes_to_words, - types::{Address, AuthenticationPath, Commitment, Key, Nullifier, ProgramId}, + types::{Address, AuthenticationPath, Commitment, Nullifier, ProgramId}, }; use std::collections::{BTreeMap, HashSet}; diff --git a/risc0-selective-privacy-poc/examples/private_execution.rs b/risc0-selective-privacy-poc/examples/private_execution.rs index 8ea15fe..a7d4d7f 100644 --- a/risc0-selective-privacy-poc/examples/private_execution.rs +++ b/risc0-selective-privacy-poc/examples/private_execution.rs @@ -5,7 +5,6 @@ use core::{ visibility::InputVisibiility, }; use nssa::program::TransferMultipleProgram; -use program_methods::OUTER_ID; use sparse_merkle_tree::SparseMerkleTree; /// A private execution of the TransferMultiple function. diff --git a/risc0-selective-privacy-poc/examples/public_execution.rs b/risc0-selective-privacy-poc/examples/public_execution.rs index 97dc972..9ce0f76 100644 --- a/risc0-selective-privacy-poc/examples/public_execution.rs +++ b/risc0-selective-privacy-poc/examples/public_execution.rs @@ -1,5 +1,4 @@ use core::account::Account; -use risc0_zkvm::{default_executor, ExecutorEnv}; use nssa;