zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up value balance generation.

This commit is contained in:
Kris Nuttycombe 2021-04-30 07:59:46 -06:00
parent 25c90dda4b
commit a119a27ee7
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bundle.rs
View File

@ -358,7 +358,8 @@ pub mod testing {
}, },
}, },
value::{ value::{
testing::arb_note_value, NoteValue, ValueCommitTrapdoor, ValueCommitment, ValueSum, testing::{arb_positive_note_value, MAX_MONEY},
NoteValue, ValueCommitTrapdoor, ValueCommitment, ValueSum,
}, },
Anchor, Anchor,
}; };
@ -450,7 +451,7 @@ pub mod testing {
/// [`crate::builder::testing::arb_bundle`] /// [`crate::builder::testing::arb_bundle`]
pub fn arb_unauthorized_bundle()( pub fn arb_unauthorized_bundle()(
acts in vec( acts in vec(
arb_note_value().prop_flat_map(|v| arb_positive_note_value(MAX_MONEY as u64 / 10000).prop_flat_map(|v|
arb_unauthorized_action(v).prop_map(move |a| (v, a)) arb_unauthorized_action(v).prop_map(move |a| (v, a))
), ),
1..10 1..10
@ -458,15 +459,12 @@ pub mod testing {
flags in arb_flags(), flags in arb_flags(),
anchor in prop::array::uniform32(prop::num::u8::ANY).prop_map(Anchor) anchor in prop::array::uniform32(prop::num::u8::ANY).prop_map(Anchor)
) -> Bundle<Unauthorized, ValueSum> { ) -> Bundle<Unauthorized, ValueSum> {
let (values, actions): (Vec<NoteValue>, Vec<Action<()>>) = acts.into_iter().unzip(); let (note_values, actions): (Vec<NoteValue>, Vec<Action<_>>) = acts.into_iter().unzip();
Bundle::from_parts( Bundle::from_parts(
NonEmpty::from_vec(actions).unwrap(), NonEmpty::from_vec(actions).unwrap(),
flags, flags,
values.into_iter().fold( note_values.into_iter().map(ValueSum::from).sum::<Result<ValueSum, _>>().unwrap(),
ValueSum::zero(),
|acc, cv| (acc + (cv - NoteValue::zero()).unwrap()).unwrap()
),
anchor, anchor,
Unauthorized Unauthorized
) )
@ -479,7 +477,7 @@ pub mod testing {
/// [`crate::builder::testing::arb_bundle`] /// [`crate::builder::testing::arb_bundle`]
pub fn arb_bundle()( pub fn arb_bundle()(
acts in vec( acts in vec(
arb_note_value().prop_flat_map(|v| arb_positive_note_value(MAX_MONEY as u64 / 10000).prop_flat_map(|v|
arb_action(v).prop_map(move |a| (v, a)) arb_action(v).prop_map(move |a| (v, a))
), ),
1..10 1..10
@ -491,16 +489,13 @@ pub mod testing {
fake_proof in vec(prop::num::u8::ANY, 1973), fake_proof in vec(prop::num::u8::ANY, 1973),
fake_sighash in prop::array::uniform32(prop::num::u8::ANY), fake_sighash in prop::array::uniform32(prop::num::u8::ANY),
) -> Bundle<Authorized, ValueSum> { ) -> Bundle<Authorized, ValueSum> {
let (values, actions): (Vec<NoteValue>, Vec<Action<redpallas::Signature<reddsa::orchard::SpendAuth>>>) = acts.into_iter().unzip(); let (note_values, actions): (Vec<NoteValue>, Vec<Action<_>>) = acts.into_iter().unzip();
let rng = StdRng::from_seed(rng_seed); let rng = StdRng::from_seed(rng_seed);
Bundle::from_parts( Bundle::from_parts(
NonEmpty::from_vec(actions).unwrap(), NonEmpty::from_vec(actions).unwrap(),
flags, flags,
values.into_iter().fold( note_values.into_iter().map(ValueSum::from).sum::<Result<ValueSum, _>>().unwrap(),
ValueSum::zero(),
|acc, cv| (acc + (cv - NoteValue::zero()).unwrap()).unwrap()
),
anchor, anchor,
Authorized { Authorized {
proof: Proof(fake_proof), proof: Proof(fake_proof),

14
src/value.rs
View File

@ -110,7 +110,13 @@ impl Add for ValueSum {
impl<'a> Sum<&'a ValueSum> for Result<ValueSum, OverflowError> { impl<'a> Sum<&'a ValueSum> for Result<ValueSum, OverflowError> {
fn sum<I: Iterator<Item = &'a ValueSum>>(iter: I) -> Self { fn sum<I: Iterator<Item = &'a ValueSum>>(iter: I) -> Self {
iter.fold(Ok(ValueSum(0)), |acc, cv| (acc? + *cv).ok_or(OverflowError)) iter.fold(Ok(ValueSum(0)), |acc, v| (acc? + *v).ok_or(OverflowError))
}
}
impl Sum<ValueSum> for Result<ValueSum, OverflowError> {
fn sum<I: Iterator<Item = ValueSum>>(iter: I) -> Self {
iter.fold(Ok(ValueSum(0)), |acc, v| (acc? + v).ok_or(OverflowError))
} }
} }
@ -122,6 +128,12 @@ impl TryFrom<ValueSum> for i64 {
} }
} }
impl From<NoteValue> for ValueSum {
fn from(v: NoteValue) -> Self {
ValueSum(v.0 as i128)
}
}
/// The blinding factor for a [`ValueCommitment`]. /// The blinding factor for a [`ValueCommitment`].
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ValueCommitTrapdoor(pallas::Scalar); pub struct ValueCommitTrapdoor(pallas::Scalar);