ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-12-18 15:31:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix the missing assignment issue

Browse Source
This commit is contained in:
weikeng 2021-07-28 11:10:02 -07:00
parent 07f7f65685
commit a3f5f5b71d
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compiler/src/value/address/address.rs
View File

@ -85,33 +85,57 @@ impl Address {
Ok(ConstrainedValue::Address(address)) Ok(ConstrainedValue::Address(address))
} }
pub(crate) fn alloc_helper<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>>( pub(crate) fn alloc_helper<
F: PrimeField,
CS: ConstraintSystem<F>,
Fn: FnOnce() -> Result<T, SynthesisError>,
T: Borrow<String>,
>(
cs: CS,
value_gen: Fn, value_gen: Fn,
) -> Result<AleoAddress<Components>, SynthesisError> { ) -> Result<AleoAddress<Components>, SynthesisError> {
let address_string = match value_gen() { if cs.is_in_setup_mode() {
Ok(value) => { Ok(AleoAddress::<Components>::default())
let string_value = value.borrow().clone(); } else {
Ok(string_value) let address_string = value_gen()?.borrow().clone();
}
_ => Err(SynthesisError::AssignmentMissing),
}?;
AleoAddress::from_str(&address_string).map_err(|_| SynthesisError::AssignmentMissing) AleoAddress::from_str(&address_string).map_err(|_| SynthesisError::AssignmentMissing)
} }
} }
}
impl<F: PrimeField> AllocGadget<String, F> for Address { impl<F: PrimeField> AllocGadget<String, F> for Address {
fn alloc<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>, CS: ConstraintSystem<F>>( fn alloc_constant<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>, CS: ConstraintSystem<F>>(
cs: CS, _cs: CS,
value_gen: Fn, value_gen: Fn,
) -> Result<Self, SynthesisError> { ) -> Result<Self, SynthesisError> {
let address = Self::alloc_helper(value_gen)?; let address = {
let address_string = value_gen()?.borrow().clone();
AleoAddress::from_str(&address_string).map_err(|_| SynthesisError::AssignmentMissing)?
};
let mut address_bytes = vec![]; let mut address_bytes = vec![];
address address
.write_le(&mut address_bytes) .write_le(&mut address_bytes)
.map_err(|_| SynthesisError::AssignmentMissing)?; .map_err(|_| SynthesisError::AssignmentMissing)?;
let bytes = UInt8::alloc_vec(cs, &address_bytes[..])?; let bytes = UInt8::constant_vec(&address_bytes[..]);
Ok(Address {
address: Some(address),
bytes,
})
}
fn alloc<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>, CS: ConstraintSystem<F>>(
mut cs: CS,
value_gen: Fn,
) -> Result<Self, SynthesisError> {
let address = Self::alloc_helper(cs.ns(|| "allocate the address"), value_gen)?;
let mut address_bytes = vec![];
address
.write_le(&mut address_bytes)
.map_err(|_| SynthesisError::AssignmentMissing)?;
let bytes = UInt8::alloc_vec(cs.ns(|| "allocate the address bytes"), &address_bytes[..])?;
Ok(Address { Ok(Address {
address: Some(address), address: Some(address),
@ -120,16 +144,16 @@ impl<F: PrimeField> AllocGadget<String, F> for Address {
} }
fn alloc_input<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>, CS: ConstraintSystem<F>>( fn alloc_input<Fn: FnOnce() -> Result<T, SynthesisError>, T: Borrow<String>, CS: ConstraintSystem<F>>(
cs: CS, mut cs: CS,
value_gen: Fn, value_gen: Fn,
) -> Result<Self, SynthesisError> { ) -> Result<Self, SynthesisError> {
let address = Self::alloc_helper(value_gen)?; let address = Self::alloc_helper(cs.ns(|| "allocate the address"), value_gen)?;
let mut address_bytes = vec![]; let mut address_bytes = vec![];
address address
.write_le(&mut address_bytes) .write_le(&mut address_bytes)
.map_err(|_| SynthesisError::AssignmentMissing)?; .map_err(|_| SynthesisError::AssignmentMissing)?;
let bytes = UInt8::alloc_input_vec_le(cs, &address_bytes[..])?; let bytes = UInt8::alloc_input_vec_le(cs.ns(|| "allocate the address bytes"), &address_bytes[..])?;
Ok(Address { Ok(Address {
address: Some(address), address: Some(address),