remove now-unused root_bagging db field

Author: roberto-bayardo

storage/src/qmdb/any/db.rs

@@ -13,7 +13,7 @@ use crate::{
         contiguous::{Contiguous, Mutable, Reader},
         Error as JournalError,
     },
-    merkle::{Bagging, Family, Location, Proof},
+    merkle::{Family, Location, Proof},
     qmdb::{
         bitmap::Shared, build_snapshot_from_log, delete_known_loc,
         operation::Operation as OperationTrait, update_known_loc, Error,
@@ -79,10 +79,6 @@ pub struct Db<
     /// Whether the operations root uses inactive-prefix split semantics.
     pub(crate) split_root: bool,
 
-    /// Bagging used by the operations root.
-    #[allow(dead_code)]
-    pub(crate) root_bagging: Bagging,
-
     /// A location before which all operations are "inactive" (that is, operations before this point
     /// are over keys that have been updated by some operation at or after this point).
     pub(crate) inactivity_floor_loc: Location<F>,
@@ -573,7 +569,6 @@ where
         log: AuthenticatedLog<F, E, C, H>,
         shared_bitmap: Option<Arc<Shared<N>>>,
         split_root: bool,
-        root_bagging: Bagging,
     ) -> Result<Self, crate::qmdb::Error<F>> {
         let (last_commit_loc, inactivity_floor_loc, active_keys, bitmap) = {
             let reader = log.reader().await;
@@ -666,7 +661,6 @@ where
             log,
             root,
             split_root,
-            root_bagging,
             inactivity_floor_loc,
             snapshot: index,
             last_commit_loc,

storage/src/qmdb/any/mod.rs

@@ -157,13 +157,12 @@ where
     Operation<F, U>: Committable + CodecShared,
 {
     let split_root = cfg.split_root;
-    let root_bagging = cfg.root_bagging;
     let mut log = J::init::<F, H>(
         context.with_label("log"),
         cfg.merkle_config,
         cfg.journal_config,
         Operation::is_commit,
-        root_bagging,
+        cfg.root_bagging,
     )
     .await?;
 
@@ -175,7 +174,7 @@ where
     }
 
     let index = I::new(context.with_label("index"), cfg.translator);
-    db::Db::init_from_log(index, log, bitmap, split_root, root_bagging).await
+    db::Db::init_from_log(index, log, bitmap, split_root).await
 }
 
 #[cfg(test)]

storage/src/qmdb/any/ordered/fixed.rs

@@ -162,7 +162,7 @@ pub(crate) mod test {
     async fn open_db_generic<F: Family + Bagging>(
         context: deterministic::Context,
     ) -> AnyTestGeneric<F> {
-        let cfg = fixed_db_config::<mmr::Family, TwoCap>("partition", &context);
+        let cfg = fixed_db_config::<F, TwoCap>("partition", &context);
         crate::qmdb::any::init(context, cfg).await.unwrap()
     }
 

storage/src/qmdb/any/sync/mod.rs

@@ -128,7 +128,7 @@ where
         apply_batch_size as u64,
     )
     .await?;
-    let db = Db::init_from_log(index, log, None, split_root, root_bagging).await?;
+    let db = Db::init_from_log(index, log, None, split_root).await?;
 
     Ok(db)
 }

storage/src/qmdb/any/unordered/fixed.rs

@@ -151,7 +151,7 @@ pub(crate) mod test {
     async fn open_db_generic<F: Family + Bagging>(
         context: deterministic::Context,
     ) -> AnyTestGeneric<F> {
-        let cfg = fixed_db_config::<mmr::Family, TwoCap>("partition", &context);
+        let cfg = fixed_db_config::<F, TwoCap>("partition", &context);
         crate::qmdb::any::init(context, cfg).await.unwrap()
     }
 

storage/src/qmdb/current/sync/mod.rs

@@ -149,7 +149,7 @@ where
     // Build any::Db, handing it the pre-allocated bitmap. `init_from_log` populates the bitmap
     // during replay.
     let any: AnyDb<F, E, J, I, H, U, N> =
-        AnyDb::init_from_log(index, log, Some(bitmap), false, Bagging::ForwardFold).await?;
+        AnyDb::init_from_log(index, log, Some(bitmap), false).await?;
 
     // Fetch grafted pinned nodes from the ops tree. For each position the grafted family
     // needs at its pruning boundary, source the digest from the ops tree via the zero-chunk