From e72d74ccd632525e19a28f142331cd1686734de8 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 5 May 2021 11:46:24 -0600 Subject: [PATCH] Remove extraneous pub exports from the root. --- src/builder.rs | 3 ++- src/bundle.rs | 30 +++++++++++++++++++++++------- src/circuit.rs | 5 ++--- src/keys.rs | 6 +++--- src/lib.rs | 6 ++---- src/value.rs | 6 ------ 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index 31eb1e9a..c6fa9253 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -9,15 +9,16 @@ use pasta_curves::pallas; use rand::RngCore; use crate::{ + address::Address, bundle::{Action, Authorization, Authorized, Bundle, Flags}, circuit::{Circuit, Proof, ProvingKey}, keys::{ FullViewingKey, OutgoingViewingKey, SpendAuthorizingKey, SpendValidatingKey, SpendingKey, }, + note::{Note, TransmittedNoteCiphertext}, primitives::redpallas::{self, Binding, SpendAuth}, tree::{Anchor, MerklePath}, value::{self, NoteValue, OverflowError, ValueCommitTrapdoor, ValueCommitment, ValueSum}, - Address, Note, TransmittedNoteCiphertext, }; const MIN_ACTIONS: usize = 2; diff --git a/src/bundle.rs b/src/bundle.rs index 946d6df8..525f2b39 100644 --- a/src/bundle.rs +++ b/src/bundle.rs @@ -429,8 +429,16 @@ pub mod testing { move |spend_value| { arb_nonnegative_note_value(MAX_NOTE_VALUE / n_actions as u64).prop_flat_map( move |output_value| { - let spend_value = if flags.spends_enabled { spend_value } else { NoteValue::zero() }; - let output_value = if flags.outputs_enabled { output_value } else { NoteValue::zero() }; + let spend_value = if flags.spends_enabled { + spend_value + } else { + NoteValue::zero() + }; + let output_value = if flags.outputs_enabled { + output_value + } else { + NoteValue::zero() + }; arb_unauthorized_action(spend_value, output_value) .prop_map(move |a| ((spend_value - output_value).unwrap(), a)) }, @@ -483,8 +491,16 @@ pub mod testing { move |spend_value| { arb_nonnegative_note_value(MAX_NOTE_VALUE / n_actions as u64).prop_flat_map( move |output_value| { - let spend_value = if flags.spends_enabled { spend_value } else { NoteValue::zero() }; - let output_value = if flags.outputs_enabled { output_value } else { NoteValue::zero() }; + let spend_value = if flags.spends_enabled { + spend_value + } else { + NoteValue::zero() + }; + let output_value = if flags.outputs_enabled { + output_value + } else { + NoteValue::zero() + }; arb_action(spend_value, output_value) .prop_map(move |a| ((spend_value - output_value).unwrap(), a)) }, @@ -505,7 +521,7 @@ pub mod testing { /// necessarily respect consensus rules; for that use /// [`crate::builder::testing::arb_bundle`] pub fn arb_unauthorized_bundle() - ( + ( n_actions in 1usize..100, flags in arb_flags(), ) @@ -531,7 +547,7 @@ pub mod testing { /// necessarily respect consensus rules; for that use /// [`crate::builder::testing::arb_bundle`] pub fn arb_bundle() - ( + ( n_actions in 1usize..100, flags in arb_flags(), ) @@ -553,7 +569,7 @@ pub mod testing { balances.into_iter().sum::>().unwrap(), anchor, Authorized { - proof: Proof(fake_proof), + proof: Proof::new(fake_proof), binding_signature: sk.sign(rng, &fake_sighash), } ) diff --git a/src/circuit.rs b/src/circuit.rs index 3fe682df..af2a6d78 100644 --- a/src/circuit.rs +++ b/src/circuit.rs @@ -7,11 +7,10 @@ use halo2::{ use pasta_curves::{pallas, vesta}; use crate::{ - note::ExtractedNoteCommitment, + note::{nullifier::Nullifier, ExtractedNoteCommitment}, primitives::redpallas::{SpendAuth, VerificationKey}, tree::Anchor, value::ValueCommitment, - Nullifier, }; pub(crate) mod gadget; @@ -118,7 +117,7 @@ impl Instance { /// /// [`Bundle`]: crate::bundle::Bundle #[derive(Debug)] -pub struct Proof(pub(crate) Vec); +pub struct Proof(Vec); impl AsRef<[u8]> for Proof { fn as_ref(&self) -> &[u8] { diff --git a/src/keys.rs b/src/keys.rs index f51ea2f3..58116f0e 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -385,9 +385,9 @@ pub mod testing { prop_compose! { /// Generate a uniformly distributed fake note commitment value. pub fn arb_spending_key()( - key in prop::array::uniform32(prop::num::u8::ANY). - prop_map(SpendingKey::from_bytes). - prop_filter( + key in prop::array::uniform32(prop::num::u8::ANY) + .prop_map(SpendingKey::from_bytes) + .prop_filter( "Values must correspond to valid Orchard spending keys.", |opt| bool::from(opt.is_some()) ) diff --git a/src/lib.rs b/src/lib.rs index 9ecfc867..f789bced 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -29,9 +29,7 @@ mod tree; pub mod value; pub use address::Address; -pub use bundle::{Action, Authorization, Authorized, Bundle}; +pub use bundle::Bundle; pub use circuit::Proof; -pub use note::{ - ExtractedNoteCommitment, Note, NoteCommitment, Nullifier, TransmittedNoteCiphertext, -}; +pub use note::Note; pub use tree::Anchor; diff --git a/src/value.rs b/src/value.rs index f75380a2..b572941e 100644 --- a/src/value.rs +++ b/src/value.rs @@ -139,12 +139,6 @@ impl TryFrom for i64 { } } -impl From for ValueSum { - fn from(v: NoteValue) -> Self { - ValueSum(v.0 as i128) - } -} - /// The blinding factor for a [`ValueCommitment`]. #[derive(Clone, Debug)] pub struct ValueCommitTrapdoor(pallas::Scalar);