Skip to content

Commit d393978

Browse files
committed
Use the Vec storage convenience constructor in benches
1 parent 0246fbe commit d393978

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

benches/cascading_merkle_tree.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ fn bench_cascading_proof_from_hash(criterion: &mut Criterion) {
3232
let leaf = Field::from(234123412341usize);
3333
b.iter_batched_ref(
3434
|| {
35-
let mut tree = CascadingMerkleTree::<PoseidonHash>::from_storage_with_leaves(
36-
vec![],
35+
let mut tree = CascadingMerkleTree::<PoseidonHash>::with_leaves(
3736
tree_value.depth,
3837
&tree_value.empty_value,
3938
&tree_value.initial_values,
@@ -59,8 +58,7 @@ fn bench_cascading_validate(criterion: &mut Criterion) {
5958
let mut group = criterion.benchmark_group("bench_cascading_validate");
6059

6160
for value in tree_values.iter() {
62-
let tree = CascadingMerkleTree::<PoseidonHash>::from_storage_with_leaves(
63-
vec![],
61+
let tree = CascadingMerkleTree::<PoseidonHash>::with_leaves(
6462
value.depth,
6563
&value.empty_value,
6664
&value.initial_values,
@@ -94,8 +92,7 @@ fn bench_cascading_create_dense_tree(criterion: &mut Criterion) {
9492
value,
9593
|bencher: &mut criterion::Bencher, value| {
9694
bencher.iter(|| {
97-
let _tree = CascadingMerkleTree::<PoseidonHash>::from_storage_with_leaves(
98-
vec![],
95+
let _tree = CascadingMerkleTree::<PoseidonHash>::with_leaves(
9996
value.depth,
10097
&value.empty_value,
10198
&value.initial_values,
@@ -192,8 +189,7 @@ fn bench_cascading_restore_dense_mmap_tree(criterion: &mut Criterion) {
192189
fn bench_cascading_dense_tree_reads(criterion: &mut Criterion) {
193190
let tree_value = create_values_for_tree(14);
194191

195-
let tree = CascadingMerkleTree::<PoseidonHash>::from_storage_with_leaves(
196-
vec![],
192+
let tree = CascadingMerkleTree::<PoseidonHash>::with_leaves(
197193
tree_value.depth,
198194
&tree_value.empty_value,
199195
&tree_value.initial_values,
@@ -241,8 +237,7 @@ fn bench_cascading_dense_tree_writes(criterion: &mut Criterion) {
241237
criterion.bench_function("dense tree writes", |b| {
242238
b.iter_batched_ref(
243239
|| {
244-
CascadingMerkleTree::<PoseidonHash>::from_storage_with_leaves(
245-
vec![],
240+
CascadingMerkleTree::<PoseidonHash>::with_leaves(
246241
tree_value.depth,
247242
&tree_value.empty_value,
248243
&tree_value.initial_values,

src/cascading_merkle_tree.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ impl<H> CascadingMerkleTree<H, Vec<H::Hash>>
4949
where
5050
H: Hasher,
5151
{
52-
pub fn new(depth: usize, empty_value: &H::Hash) -> Result<Self> {
53-
Self::from_storage(vec![], depth, empty_value)
52+
pub fn new(depth: usize, empty_value: &H::Hash) -> Self {
53+
Self::from_storage_with_leaves(vec![], depth, empty_value, &[])
5454
}
5555

5656
pub fn with_leaves(depth: usize, empty_value: &H::Hash, leaves: &[H::Hash]) -> Self {

0 commit comments

Comments
 (0)