diff --git a/Cargo.toml b/Cargo.toml index b5236b9..5ea823a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-merkle-mountain-range" -version = "0.3.1" +version = "0.3.2" authors = ["Nervos Core Dev "] edition = "2018" license = "MIT" diff --git a/benches/mmr_benchmark.rs b/benches/mmr_benchmark.rs index f27e8e6..27a5645 100644 --- a/benches/mmr_benchmark.rs +++ b/benches/mmr_benchmark.rs @@ -1,7 +1,7 @@ #[macro_use] extern crate criterion; -use criterion::Criterion; +use criterion::{BenchmarkId, Criterion}; use bytes::Bytes; use ckb_merkle_mountain_range::{util::MemStore, Error, MMRStore, Merge, Result, MMR}; @@ -53,13 +53,15 @@ fn prepare_mmr(count: u32) -> (u64, MemStore, Vec) { } fn bench(c: &mut Criterion) { - c.bench_function_over_inputs( - "MMR insert", - |b, &&size| { - b.iter(|| prepare_mmr(size)); - }, - &[10_000, 100_000, 100_0000], - ); + { + let mut group = c.benchmark_group("MMR insertion"); + let inputs = [10_000, 100_000, 100_0000]; + for input in inputs.iter() { + group.bench_with_input(BenchmarkId::new("times", input), &input, |b, &&size| { + b.iter(|| prepare_mmr(size)); + }); + } + } c.bench_function("MMR gen proof", |b| { let (mmr_size, store, positions) = prepare_mmr(100_0000); diff --git a/src/mmr.rs b/src/mmr.rs index 87e7b18..fd4bfc4 100644 --- a/src/mmr.rs +++ b/src/mmr.rs @@ -14,6 +14,7 @@ use crate::{Error, Merge, Result}; use core::fmt::Debug; use core::marker::PhantomData; +#[allow(clippy::upper_case_acronyms)] pub struct MMR> { mmr_size: u64, batch: MMRBatch,