[storage] require explicit Strategy generics (#3751)

Co-authored-by: Amp <noreply@ampcode.com>

Author: clabby

examples/sync/src/databases/any.rs

@@ -24,13 +24,13 @@ use std::{future::Future, num::NonZeroU64};
 use tracing::error;
 
 /// Database type alias.
-pub type Database<E> = Db<mmr::Family, E, Key, Value, Hasher, Translator>;
+pub type Database<E> = Db<mmr::Family, E, Key, Value, Hasher, Translator, Sequential>;
 
 /// Operation type alias.
 pub type Operation = FixedOperation<mmr::Family, Key, Value>;
 
 /// Create a database configuration for use in tests.
-pub fn create_config(context: &impl BufferPooler) -> Config<Translator> {
+pub fn create_config(context: &impl BufferPooler) -> Config<Translator, Sequential> {
     let page_cache = buffer::paged::CacheRef::from_pooler(context, NZU16!(2048), NZUsize!(10));
     Config {
         merkle_config: MmrConfig {

examples/sync/src/databases/current.rs

@@ -37,14 +37,22 @@ use tracing::error;
 const CHUNK_SIZE: usize = sha256::Digest::SIZE;
 
 /// Database type alias.
-pub type Database<E> =
-    current::unordered::fixed::Db<mmr::Family, E, Key, Value, Hasher, Translator, CHUNK_SIZE>;
+pub type Database<E> = current::unordered::fixed::Db<
+    mmr::Family,
+    E,
+    Key,
+    Value,
+    Hasher,
+    Translator,
+    CHUNK_SIZE,
+    Sequential,
+>;
 
 /// Operation type alias. Same as the `any` operation type.
 pub type Operation = FixedOperation<mmr::Family, Key, Value>;
 
 /// Create a database configuration.
-pub fn create_config(context: &impl BufferPooler) -> Config<Translator> {
+pub fn create_config(context: &impl BufferPooler) -> Config<Translator, Sequential> {
     let page_cache = buffer::paged::CacheRef::from_pooler(context, NZU16!(2048), NZUsize!(10));
     Config {
         merkle_config: MmrConfig {

examples/sync/src/databases/immutable.rs

@@ -21,13 +21,13 @@ use std::{future::Future, num::NonZeroU64};
 use tracing::error;
 
 /// Database type alias.
-pub type Database<E> = fixed::Db<mmr::Family, E, Key, Value, Hasher, Translator>;
+pub type Database<E> = fixed::Db<mmr::Family, E, Key, Value, Hasher, Translator, Sequential>;
 
 /// Operation type alias.
 pub type Operation = fixed::Operation<mmr::Family, Key, Value>;
 
 /// Create a database configuration with appropriate partitioning for Immutable.
-pub fn create_config(context: &impl BufferPooler) -> Config<Translator, FConfig> {
+pub fn create_config(context: &impl BufferPooler) -> Config<Translator, FConfig, Sequential> {
     let page_cache = commonware_runtime::buffer::paged::CacheRef::from_pooler(
         context,
         NZU16!(2048),

examples/sync/src/databases/immutable_compact.rs

@@ -17,13 +17,13 @@ use commonware_storage::{
 use tracing::error;
 
 /// Database type alias.
-pub type Database<E> = fixed::CompactDb<mmr::Family, E, Key, Value, Hasher>;
+pub type Database<E> = fixed::CompactDb<mmr::Family, E, Key, Value, Hasher, Sequential>;
 
 /// Operation type alias.
 pub type Operation = fixed::Operation<mmr::Family, Key, Value>;
 
 /// Create a database configuration for the compact immutable variant.
-pub fn create_config(_context: &impl BufferPooler) -> CompactConfig {
+pub fn create_config(_context: &impl BufferPooler) -> CompactConfig<Sequential> {
     CompactConfig {
         merkle: MerkleConfig {
             partition: "compact-immutable".into(),

examples/sync/src/databases/keyless.rs

@@ -27,13 +27,13 @@ use std::num::NonZeroU64;
 use tracing::error;
 
 /// Database type alias.
-pub type Database<E> = fixed::Db<mmr::Family, E, Value, Hasher>;
+pub type Database<E> = fixed::Db<mmr::Family, E, Value, Hasher, Sequential>;
 
 /// Operation type alias.
 pub type Operation = fixed::Operation<mmr::Family, Value>;
 
 /// Create a database configuration for the keyless variant.
-pub fn create_config(context: &impl BufferPooler) -> fixed::Config {
+pub fn create_config(context: &impl BufferPooler) -> fixed::Config<Sequential> {
     let page_cache = buffer::paged::CacheRef::from_pooler(context, NZU16!(2048), NZUsize!(10));
     keyless::Config {
         merkle: MmrConfig {

examples/sync/src/databases/keyless_compact.rs

@@ -17,13 +17,13 @@ use commonware_storage::{
 use tracing::error;
 
 /// Database type alias.
-pub type Database<E> = fixed::CompactDb<mmr::Family, E, Value, Hasher>;
+pub type Database<E> = fixed::CompactDb<mmr::Family, E, Value, Hasher, Sequential>;
 
 /// Operation type alias.
 pub type Operation = fixed::Operation<mmr::Family, Value>;
 
 /// Create a database configuration for the compact keyless variant.
-pub fn create_config(_context: &impl BufferPooler) -> CompactConfig {
+pub fn create_config(_context: &impl BufferPooler) -> CompactConfig<Sequential> {
     CompactConfig {
         merkle: MerkleConfig {
             partition: "compact-keyless".into(),

storage/fuzz/fuzz_targets/current_crash_recovery.rs

@@ -38,7 +38,7 @@ type RawValue = [u8; 32];
 /// Maximum write buffer size.
 const MAX_WRITE_BUF: usize = 2048;
 
-type Db<F> = Current<F, deterministic::Context, Key, Value, Sha256, TwoCap, 32>;
+type Db<F> = Current<F, deterministic::Context, Key, Value, Sha256, TwoCap, 32, Sequential>;
 
 fn bounded_page_size(u: &mut Unstructured<'_>) -> Result<u16> {
     u.int_in_range(1..=256)
@@ -99,7 +99,7 @@ fn make_config(
     merkle_items_per_blob: u64,
     log_items_per_blob: u64,
     write_buffer: NonZeroUsize,
-) -> VariableConfig<TwoCap, ((), ())> {
+) -> VariableConfig<TwoCap, ((), ()), Sequential> {
     let page_cache = CacheRef::from_pooler(ctx, page_size, page_cache_size);
     VariableConfig {
         merkle_config: MerkleConfig {

storage/fuzz/fuzz_targets/current_mmb_prune_grow.rs

@@ -33,7 +33,8 @@ type Key = FixedBytes<1>;
 type Value = FixedBytes<32>;
 type LogicalKey = u8;
 type RawValue = [u8; 32];
-type Db = CurrentDb<mmb::Family, deterministic::Context, Key, Value, Sha256, TwoCap, 32>;
+type Db =
+    CurrentDb<mmb::Family, deterministic::Context, Key, Value, Sha256, TwoCap, 32, Sequential>;
 
 #[derive(Arbitrary, Debug, Clone)]
 enum CurrentOperation {
@@ -145,7 +146,7 @@ const MERKLE_ITEMS_PER_BLOB: u64 = 11;
 const LOG_ITEMS_PER_BLOB: u64 = 7;
 const WRITE_BUFFER_SIZE: usize = 1024;
 
-fn test_config(name: &str, page_cache: CacheRef) -> Config<TwoCap> {
+fn test_config(name: &str, page_cache: CacheRef) -> Config<TwoCap, Sequential> {
     Config {
         merkle_config: MerkleConfig {
             journal_partition: format!("fuzz-current-mmb-pruning-{name}-merkle-journal"),
@@ -225,7 +226,7 @@ async fn prune_to_floor(db: &mut Db, reference_db: &Db, context: &str) {
 async fn reopen_pruned_db(
     db: Db,
     context: &deterministic::Context,
-    config: &Config<TwoCap>,
+    config: &Config<TwoCap, Sequential>,
     reference_db: &Db,
     reopen_count: usize,
 ) -> Db {
@@ -301,7 +302,7 @@ async fn bootstrap_pruned_state(
 
 struct ReopenEnv<'a> {
     context: &'a deterministic::Context,
-    config: &'a Config<TwoCap>,
+    config: &'a Config<TwoCap, Sequential>,
     count: &'a mut usize,
 }
 

storage/fuzz/fuzz_targets/current_ordered_operations.rs

@@ -24,7 +24,7 @@ type Key = FixedBytes<32>;
 type Value = FixedBytes<32>;
 type RawKey = [u8; 32];
 type RawValue = [u8; 32];
-type Db<F> = CurrentDb<F, deterministic::Context, Key, Value, Sha256, TwoCap, 32>;
+type Db<F> = CurrentDb<F, deterministic::Context, Key, Value, Sha256, TwoCap, 32, Sequential>;
 
 #[derive(Arbitrary, Debug, Clone)]
 enum CurrentOperation {

storage/fuzz/fuzz_targets/current_unordered_batch_root.rs

@@ -18,7 +18,7 @@ use std::num::NonZeroU16;
 
 type Key = FixedBytes<32>;
 type Value = FixedBytes<32>;
-type Db<F> = CurrentDb<F, deterministic::Context, Key, Value, Sha256, OneCap, 32>;
+type Db<F> = CurrentDb<F, deterministic::Context, Key, Value, Sha256, OneCap, 32, Sequential>;
 
 const PAGE_SIZE: NonZeroU16 = NZU16!(137);
 const COLLISION_GROUPS: u8 = 4;
@@ -76,7 +76,7 @@ impl<'a> Arbitrary<'a> for FuzzInput {
     }
 }
 
-fn test_config(name: &str, pooler: &impl BufferPooler) -> Config<OneCap> {
+fn test_config(name: &str, pooler: &impl BufferPooler) -> Config<OneCap, Sequential> {
     let page_cache = CacheRef::from_pooler(pooler, PAGE_SIZE, NZUsize!(2));
     Config {
         merkle_config: MerkleConfig {