Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: avoid cloning and use .map/.entry in Rust code #181

Merged
merged 1 commit into from
Sep 5, 2023
Merged

chore: avoid cloning and use .map/.entry in Rust code #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions rust/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,26 +582,29 @@

#[cfg(feature = "std")]
fn load_batch(files: &[&str]) -> Result<(ics23::CommitmentProof, Vec<RefData>)> {
let mut entries = Vec::new();
let mut data = Vec::new();

for &file in files {
let (proof, datum) = load_file(file)?;
data.push(datum);
match proof.proof {
Some(ics23::commitment_proof::Proof::Nonexist(non)) => {
entries.push(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Nonexist(non)),
})
}
Some(ics23::commitment_proof::Proof::Exist(ex)) => {
entries.push(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Exist(ex)),
})
let (data, entries) = files
.iter()
.map(|file| {
let (proof, datum) = load_file(file)?;
match proof.proof {
Some(ics23::commitment_proof::Proof::Nonexist(non)) => Ok((
datum,
ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Nonexist(non)),
},
)),
Some(ics23::commitment_proof::Proof::Exist(ex)) => Ok((
datum,
ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Exist(ex)),
},
)),
_ => bail!("unknown proof type to batch"),

Check warning on line 602 in rust/src/api.rs

View check run for this annotation

Codecov / codecov/patch

rust/src/api.rs#L602 

Added line #L602 was not covered by tests
}
_ => bail!("unknown proof type to batch"),
}
}
})
.collect::<Result<Vec<_>>>()?
.into_iter()
.unzip();

let batch = ics23::CommitmentProof {
proof: Some(ics23::commitment_proof::Proof::Batch(ics23::BatchProof {
Expand Down
91 changes: 43 additions & 48 deletions rust/src/compress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,43 @@
}

pub fn compress_batch(proof: &ics23::BatchProof) -> Result<ics23::CommitmentProof> {
let mut centries = Vec::new();
let mut lookup = Vec::new();
let mut registry = HashMap::new();

for entry in &proof.entries {
let centry = match &entry.proof {
let centries = proof
.entries
.iter()
.map(|entry| match &entry.proof {
Some(ics23::batch_entry::Proof::Exist(ex)) => {
let exist = compress_exist(ex, &mut lookup, &mut registry)?;
ics23::CompressedBatchEntry {
Ok(ics23::CompressedBatchEntry {
proof: Some(ics23::compressed_batch_entry::Proof::Exist(exist)),
}
})
}
Some(ics23::batch_entry::Proof::Nonexist(non)) => {
let left = non
.left
.clone()
.map(|l| compress_exist(&l, &mut lookup, &mut registry))
.as_ref()
.map(|l| compress_exist(l, &mut lookup, &mut registry))
.transpose()?;
let right = non
.right
.clone()
.map(|r| compress_exist(&r, &mut lookup, &mut registry))
.as_ref()
.map(|r| compress_exist(r, &mut lookup, &mut registry))
.transpose()?;
let nonexist = ics23::CompressedNonExistenceProof {
key: non.key.clone(),
left,
right,
};
ics23::CompressedBatchEntry {
Ok(ics23::CompressedBatchEntry {
proof: Some(ics23::compressed_batch_entry::Proof::Nonexist(nonexist)),
}
})
}
None => ics23::CompressedBatchEntry { proof: None },
};
centries.push(centry);
}
None => Ok(ics23::CompressedBatchEntry { proof: None }),

Check warning on line 66 in rust/src/compress.rs

View check run for this annotation

Codecov / codecov/patch

rust/src/compress.rs#L66 

Added line #L66 was not covered by tests
})
.collect::<Result<_>>()?;

Ok(ics23::CommitmentProof {
proof: Some(ics23::commitment_proof::Proof::Compressed(
ics23::CompressedBatchProof {
Expand All @@ -85,19 +86,15 @@
.path
.iter()
.map(|x| {
let mut buf = Vec::new();
x.encode(&mut buf)
.map_err(|e: prost::EncodeError| anyhow::anyhow!(e))?;

if let Some(&idx) = registry.get(buf.as_slice()) {
return Ok(idx);
};
let idx = lookup.len() as i32;
lookup.push(x.to_owned());
registry.insert(buf, idx);
let buf = x.encode_to_vec();
let idx = *registry.entry(buf).or_insert_with(|| {
let idx = lookup.len() as i32;
lookup.push(x.to_owned());
idx
});
Ok(idx)
})
.collect::<Result<Vec<i32>>>()?;
.collect::<Result<_>>()?;

Ok(ics23::CompressedExistenceProof {
key: exist.key.clone(),
Expand All @@ -112,30 +109,28 @@
let entries = proof
.entries
.iter()
.map(|cent| -> Result<ics23::BatchEntry> {
match &cent.proof {
Some(ics23::compressed_batch_entry::Proof::Exist(ex)) => {
let exist = decompress_exist(ex, lookup);
Ok(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Exist(exist)),
})
}
Some(ics23::compressed_batch_entry::Proof::Nonexist(non)) => {
let left = non.left.clone().map(|l| decompress_exist(&l, lookup));
let right = non.right.clone().map(|r| decompress_exist(&r, lookup));
let nonexist = ics23::NonExistenceProof {
key: non.key.clone(),
left,
right,
};
Ok(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Nonexist(nonexist)),
})
}
None => Ok(ics23::BatchEntry { proof: None }),
.map(|cent| match &cent.proof {
Some(ics23::compressed_batch_entry::Proof::Exist(ex)) => {
let exist = decompress_exist(ex, lookup);
Ok(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Exist(exist)),
})
}
Some(ics23::compressed_batch_entry::Proof::Nonexist(non)) => {
let left = non.left.as_ref().map(|l| decompress_exist(l, lookup));
let right = non.right.as_ref().map(|r| decompress_exist(r, lookup));
let nonexist = ics23::NonExistenceProof {
key: non.key.clone(),
left,
right,
};
Ok(ics23::BatchEntry {
proof: Some(ics23::batch_entry::Proof::Nonexist(nonexist)),
})
}
None => Ok(ics23::BatchEntry { proof: None }),

Check warning on line 131 in rust/src/compress.rs

View check run for this annotation

Codecov / codecov/patch

rust/src/compress.rs#L131 

Added line #L131 was not covered by tests
})
.collect::<Result<Vec<_>>>()?;
.collect::<Result<_>>()?;

Ok(ics23::CommitmentProof {
proof: Some(ics23::commitment_proof::Proof::Batch(ics23::BatchProof {
Expand Down
19 changes: 12 additions & 7 deletions rust/src/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// we want to name functions verify_* to match ics23
#![allow(clippy::module_name_repetitions)]

use alloc::borrow::Cow;
use alloc::vec::Vec;

use anyhow::{bail, ensure};
Expand Down Expand Up @@ -39,7 +40,11 @@ pub fn verify_non_existence<H: HostFunctionsProvider>(
let key_for_comparison = |key: &[u8]| -> Vec<u8> {
match spec.prehash_key_before_comparison {
true => do_hash::<H>(
spec.leaf_spec.clone().unwrap_or_default().prehash_key(),
spec.leaf_spec
.as_ref()
.map(Cow::Borrowed)
.unwrap_or_default()
.prehash_key(),
key,
),
false => key.to_vec(),
Expand Down Expand Up @@ -236,8 +241,8 @@ fn ensure_left_neighbor(
left: &[ics23::InnerOp],
right: &[ics23::InnerOp],
) -> Result<()> {
let mut mut_left = Vec::from(left);
let mut mut_right = Vec::from(right);
let mut mut_left = left.to_vec();
let mut mut_right = right.to_vec();

let mut top_left = mut_left.pop().unwrap();
let mut top_right = mut_right.pop().unwrap();
Expand All @@ -252,7 +257,8 @@ fn ensure_left_neighbor(
}

ensure_right_most(spec, &mut_left)?;
ensure_left_most(spec, &mut_right)
ensure_left_most(spec, &mut_right)?;
Ok(())
}

fn is_left_step(
Expand Down Expand Up @@ -616,8 +622,7 @@ mod tests {
},
),
]
.iter()
.cloned()
.into_iter()
.collect();

for (name, tc) in cases {
Expand Down Expand Up @@ -758,7 +763,7 @@ mod tests {

for (i, case) in cases.iter().enumerate() {
ensure_inner(&case.op, case.spec)?;
let inner = &case.spec.inner_spec.as_ref().unwrap();
let inner = case.spec.inner_spec.as_ref().unwrap();
assert_eq!(
case.is_left,
left_branches_are_empty(inner, &case.op)?,
Expand Down
Loading