address dan review

Author: roberto-bayardo

.github/benchmark-tracking.toml

@@ -52,5 +52,5 @@ name = "qmdb"
 criterion_args = ["--sample-size", "100", "--significance-level", "0.01"]
 variants = [
   "qmdb::merkleize/variant=any::unordered::fixed::mmr keys=10000 ch=false sync=false",
-  "qmdb::merkleize/variant=current::ordered::fixed::mmb keys=10000 ch=true sync=false",
+  "qmdb::merkleize/variant=current::ordered::fixed::mmb keys=10000 chunk=256 ch=true sync=false",
 ]

storage/src/qmdb/any/mod.rs

@@ -69,11 +69,12 @@ use crate::{
         authenticated::Inner,
         contiguous::{fixed::Config as FConfig, variable::Config as VConfig},
     },
-    merkle::{full::Config as MerkleConfig, Bagging, Family, Location},
+    merkle::{full::Config as MerkleConfig, Family, Location},
     qmdb::{
         any::operation::{Operation, Update},
         bitmap::Shared,
         operation::Committable,
+        ROOT_BAGGING,
     },
     translator::Translator,
     Context,
@@ -158,7 +159,7 @@ where
         cfg.merkle_config,
         cfg.journal_config,
         Operation::is_commit,
-        Bagging::BackwardFold,
+        ROOT_BAGGING,
     )
     .await?;
 

storage/src/qmdb/current/proof.rs

@@ -11,7 +11,7 @@ use crate::{
         self,
         hasher::{Hasher, Standard as StandardHasher},
         storage::Storage,
-        Bagging, Family, Graftable, Location, Position, Proof,
+        Family, Graftable, Location, Position, Proof,
     },
     qmdb::{
         self,
@@ -801,7 +801,7 @@ impl<F: Graftable, D: Digest> RangeProof<F, D> {
             grafting_height,
             start_chunk,
             chunk_vec,
-            Bagging::BackwardFold,
+            qmdb::ROOT_BAGGING,
         );
 
         // For partial chunks, validate the last chunk digest from the proof.

storage/src/qmdb/immutable/fixed.rs

@@ -8,10 +8,10 @@ use crate::{
         authenticated,
         contiguous::fixed::{self, Config as JournalConfig},
     },
-    merkle::{self, Family},
+    merkle::Family,
     qmdb::{
         any::{value::FixedEncoding, FixedValue},
-        Error,
+        Error, ROOT_BAGGING,
     },
     translator::Translator,
 };
@@ -58,7 +58,7 @@ impl<
             cfg.merkle_config,
             cfg.log,
             Operation::<F, K, V>::is_commit,
-            merkle::Bagging::BackwardFold,
+            ROOT_BAGGING,
         )
         .await?;
         Self::init_from_journal(journal, context, cfg.translator).await

storage/src/qmdb/immutable/variable.rs

@@ -8,11 +8,11 @@ use crate::{
         authenticated,
         contiguous::variable::{self, Config as JournalConfig},
     },
-    merkle::{self, Family},
+    merkle::Family,
     qmdb::{
         any::{value::VariableEncoding, VariableValue},
         operation::Key,
-        Error,
+        Error, ROOT_BAGGING,
     },
     translator::Translator,
 };
@@ -62,7 +62,7 @@ impl<
             cfg.merkle_config,
             cfg.log,
             Operation::<F, K, V>::is_commit,
-            merkle::Bagging::BackwardFold,
+            ROOT_BAGGING,
         )
         .await?;
         Self::init_from_journal(journal, context, cfg.translator).await

storage/src/qmdb/keyless/fixed.rs

@@ -7,12 +7,12 @@ use crate::{
         authenticated,
         contiguous::fixed::{self, Config as JournalConfig},
     },
-    merkle::{self, Family},
+    merkle::Family,
     qmdb::{
         any::value::{FixedEncoding, FixedValue},
         keyless::operation::Operation as BaseOperation,
         operation::Committable,
-        Error,
+        Error, ROOT_BAGGING,
     },
 };
 use commonware_cryptography::Hasher;
@@ -49,7 +49,7 @@ impl<F: Family, E: Storage + Clock + Metrics, V: FixedValue, H: Hasher, S: Strat
             cfg.merkle,
             cfg.log,
             Operation::<F, V>::is_commit,
-            merkle::Bagging::BackwardFold,
+            ROOT_BAGGING,
         )
         .await?;
         Self::init_from_journal(journal).await

storage/src/qmdb/keyless/variable.rs

@@ -7,12 +7,12 @@ use crate::{
         authenticated,
         contiguous::variable::{self, Config as JournalConfig},
     },
-    merkle::{self, Family},
+    merkle::Family,
     qmdb::{
         any::value::{VariableEncoding, VariableValue},
         keyless::operation::Operation as BaseOperation,
         operation::Committable,
-        Error,
+        Error, ROOT_BAGGING,
     },
 };
 use commonware_codec::Read;
@@ -54,7 +54,7 @@ impl<F: Family, E: Storage + Clock + Metrics, V: VariableValue, H: Hasher, S: St
             cfg.merkle,
             cfg.log,
             Operation::<F, V>::is_commit,
-            merkle::Bagging::BackwardFold,
+            ROOT_BAGGING,
         )
         .await?;
         Self::init_from_journal(journal).await

storage/src/qmdb/mod.rs

@@ -75,9 +75,12 @@ pub use verify::{
     verify_proof_and_extract_digests, verify_proof_and_pinned_nodes,
 };
 
+/// Merkle peak bagging policy used by QMDB operation roots.
+pub(crate) const ROOT_BAGGING: Bagging = Bagging::BackwardFold;
+
 /// Return the Merkle hasher configuration used by QMDB operation roots and proofs.
 pub const fn hasher<H: CryptoHasher>() -> StandardHasher<H> {
-    StandardHasher::with_bagging(Bagging::BackwardFold)
+    StandardHasher::with_bagging(ROOT_BAGGING)
 }
 
 /// Look up the inactivity floor declared at the commit immediately preceding `op_count`.