Skip to content

Commit 445e505

Browse files
roberto-bayardoroberto-bayardo
committed
no default bagging for Standard hasher
1 parent 14d789e commit 445e505

42 files changed

Lines changed: 236 additions & 227 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎storage/fuzz/fuzz_targets/merkle_family_operations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn fuzz_family<F: MerkleFamily>(operations: &[MerkleOperation]) {
128128
let runner = deterministic::Runner::default();
129129

130130
runner.start(|_context| async move {
131-
let hasher = Standard::<Sha256>::new();
131+
let hasher = Standard::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
132132
let mut merkle = Mem::<F, Digest>::new();
133133
let mut reference = ReferenceMerkle::<F>::new();
134134

‎storage/fuzz/fuzz_targets/merkle_full.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn historical_root<F: MerkleFamily>(
9292
leaves: &[Vec<u8>],
9393
requested_leaves: Location<F>,
9494
) -> <Sha256 as commonware_cryptography::Hasher>::Digest {
95-
let hasher = Standard::<Sha256>::new();
95+
let hasher = Standard::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
9696
let mut mem = Mem::<F, _>::new();
9797
let batch = {
9898
let mut batch = mem.new_batch();
@@ -115,7 +115,7 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, suffix: &str) {
115115
let operations = input.operations.clone();
116116
async move {
117117
let mut leaves = Vec::new();
118-
let hasher = Standard::<Sha256>::new();
118+
let hasher = Standard::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
119119
let mut merkle =
120120
Merkle::<F, _, _>::init(context.clone(), &hasher, test_config(suffix, &context))
121121
.await
@@ -258,7 +258,9 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, suffix: &str) {
258258
.await;
259259
match result {
260260
Ok(historical_proof) => {
261-
let verify_hasher = Standard::<Sha256>::new();
261+
let verify_hasher = Standard::<Sha256>::new(
262+
commonware_storage::merkle::Bagging::ForwardFold,
263+
);
262264
assert!(historical_proof.verify_range_inclusion(
263265
&verify_hasher,
264266
&leaves[range.to_usize_range()],

‎storage/fuzz/fuzz_targets/merkle_full_crash_recovery.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, suffix: &str) {
235235
let partition_suffix = partition_suffix.clone();
236236
let operations = operations.clone();
237237
async move {
238-
let hasher = StandardHasher::<Sha256>::new();
238+
let hasher =
239+
StandardHasher::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
239240
let mut merkle = Merkle::<F>::init(
240241
ctx.with_label("merkle"),
241242
&hasher,
@@ -267,7 +268,8 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, suffix: &str) {
267268
runner.start(|ctx| async move {
268269
*ctx.storage_fault_config().write() = deterministic::FaultConfig::default();
269270

270-
let hasher = StandardHasher::<Sha256>::new();
271+
let hasher =
272+
StandardHasher::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
271273
let mut merkle = Merkle::<F>::init(
272274
ctx.with_label("recovered"),
273275
&hasher,

‎storage/fuzz/fuzz_targets/mmr_bitmap.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ fn fuzz(input: FuzzInput) {
5959
const PARTITION: &str = "fuzz-mmr-bitmap-test-partition";
6060

6161
runner.start(|context| async move {
62-
let hasher = commonware_storage::mmr::StandardHasher::<Sha256>::new();
62+
let hasher = commonware_storage::mmr::StandardHasher::<Sha256>::new(
63+
commonware_storage::merkle::Bagging::ForwardFold,
64+
);
6365
let init_bitmap = MerkleizedBitMap::<_, _, CHUNK_SIZE>::init(
6466
context.with_label("bitmap"),
6567
PARTITION,

‎storage/fuzz/fuzz_targets/proof_store.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl<'a, F: MerkleFamily> Arbitrary<'a> for FuzzInput<F> {
5757
}
5858

5959
fn fuzz_family<F: MerkleFamily>(input: &FuzzInput<F>) {
60-
let hasher = merkle::hasher::Standard::<Sha256>::with_bagging(merkle::Bagging::BackwardFold);
60+
let hasher = merkle::hasher::Standard::<Sha256>::new(merkle::Bagging::BackwardFold);
6161
let proof = Proof::<F, Digest> {
6262
leaves: input.proof_leaves,
6363
inactive_peaks: input.inactive_peaks,

‎storage/fuzz/fuzz_targets/proofs_malleability.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn supported_root_specs<F: MerkleFamily>(merkle: &Mem<F, Digest>) -> Vec<(Baggin
143143
}
144144

145145
fn fuzz_element_proof<F: MerkleFamily>(input: &FuzzInput, digests: &[Digest]) {
146-
let build_hasher = Standard::<Sha256>::new();
146+
let build_hasher = Standard::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
147147
let mut merkle = Mem::<F, Digest>::new();
148148
let batch = {
149149
let mut batch = merkle.new_batch();
@@ -155,7 +155,7 @@ fn fuzz_element_proof<F: MerkleFamily>(input: &FuzzInput, digests: &[Digest]) {
155155
merkle.apply_batch(&batch).unwrap();
156156

157157
for (bagging, inactive_peaks) in supported_root_specs(&merkle) {
158-
let hasher = Standard::<Sha256>::with_bagging(bagging);
158+
let hasher = Standard::<Sha256>::new(bagging);
159159
let root = merkle.root(&hasher, inactive_peaks).unwrap();
160160
for (leaf, element) in digests.iter().enumerate() {
161161
let loc = Location::<F>::new(leaf as u64);
@@ -179,7 +179,7 @@ fn fuzz_element_proof<F: MerkleFamily>(input: &FuzzInput, digests: &[Digest]) {
179179
}
180180

181181
fn fuzz_range_proof<F: MerkleFamily>(input: &FuzzInput, digests: &[Digest]) {
182-
let hasher = Standard::<Sha256>::new();
182+
let hasher = Standard::<Sha256>::new(commonware_storage::merkle::Bagging::ForwardFold);
183183
let mut merkle = Mem::<F, Digest>::new();
184184
let batch = {
185185
let mut batch = merkle.new_batch();
@@ -229,7 +229,7 @@ fn fuzz_range_proof<F: MerkleFamily>(input: &FuzzInput, digests: &[Digest]) {
229229
}
230230

231231
for (bagging, inactive_peaks) in supported_root_specs(&merkle) {
232-
let hasher = Standard::<Sha256>::with_bagging(bagging);
232+
let hasher = Standard::<Sha256>::new(bagging);
233233
let root = merkle.root(&hasher, inactive_peaks).unwrap();
234234
let Ok(original_proof) = block_on(verification::historical_range_proof(
235235
&hasher,

‎storage/fuzz/fuzz_targets/qmdb_any_variable_sync.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, test_name: &str) {
165165
let test_name = test_name.to_string();
166166
runner.start(|context| async move {
167167
let hasher =
168-
merkle::hasher::Standard::<Sha256>::with_bagging(merkle::Bagging::BackwardFold);
168+
merkle::hasher::Standard::<Sha256>::new(merkle::Bagging::BackwardFold);
169169
let cfg = test_config(&test_name, &context);
170170
let mut db = Db::<F, _, Key, Vec<u8>, Sha256, TwoCap>::init(context.clone(), cfg)
171171
.await

‎storage/fuzz/fuzz_targets/qmdb_immutable.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ fn fuzz_family<F: MerkleFamily>(input: &FuzzInput, suffix: &str) {
152152
.unwrap();
153153

154154
let hasher =
155-
merkle::hasher::Standard::<Sha256>::with_bagging(merkle::Bagging::BackwardFold);
155+
merkle::hasher::Standard::<Sha256>::new(merkle::Bagging::BackwardFold);
156156
let mut keys_set: Vec<(Digest, Location<F>)> = Vec::new();
157157
let mut set_locations: Vec<(Digest, Location<F>)> = Vec::new();
158158
let mut last_commit_loc: Option<Location<F>> = None;

‎storage/fuzz/fuzz_targets/qmdb_keyless.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn fuzz_family<F: Family>(input: &FuzzInput, suffix: &str) {
216216
let runner = deterministic::Runner::default();
217217

218218
runner.start(|context| async move {
219-
let hasher = merkle::hasher::Standard::<Sha256>::with_bagging(merkle::Bagging::BackwardFold);
219+
let hasher = merkle::hasher::Standard::<Sha256>::new(merkle::Bagging::BackwardFold);
220220
let cfg = test_config(suffix, &context);
221221
let mut db: Db<F> = Db::init(context.clone(), cfg)
222222
.await

‎storage/fuzz/fuzz_targets/qmdb_ordered_operations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ async fn commit_pending<F: MerkleFamily>(
103103
}
104104

105105
fn fuzz_family<F: MerkleFamily>(data: &FuzzInput, suffix: &str) {
106-
let hasher = merkle::hasher::Standard::<Sha256>::with_bagging(merkle::Bagging::BackwardFold);
106+
let hasher = merkle::hasher::Standard::<Sha256>::new(merkle::Bagging::BackwardFold);
107107
let runner = deterministic::Runner::default();
108108

109109
runner.start(|context| {

0 commit comments

Comments
 (0)