[Refactor] simplify and unify the storage setup for tests

.circleci/config.yml

@@ -15,7 +15,7 @@ parameters:
     default: xlarge
   twoxlarge:
     type: string
-    default: aleonet/2xlarge
+    default: 2xlarge
 
 orbs:
   windows: circleci/[email protected]
@@ -945,8 +945,7 @@ workflows:
       - curves
       - fields
       - ledger
-# TODO (howardwu) - Implement `open_testing` on all storage, update to `CurrentConsensusStore::open_testing`, then re-enable.
-#      - ledger-with-rocksdb
+      - ledger-with-rocksdb
       - ledger-with-valid-solutions
       - ledger-authority
       - ledger-block

Cargo.toml

@@ -272,7 +272,7 @@ version = "1.3"
 version = "0.11.2"
 
 [dev-dependencies.tempfile]
-version = "3.8"
+version = "3.15"
 
 [build-dependencies.walkdir]
 version = "2"

algorithms/Cargo.toml

@@ -71,7 +71,8 @@ version = "=1.1.0"
 optional = true
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.anyhow]

console/collections/Cargo.toml

@@ -29,7 +29,8 @@ default-features = false
 features = [ "field", "integers" ]
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.rayon]

fields/Cargo.toml

@@ -34,7 +34,8 @@ version = "=1.1.0"
 default-features = false
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.anyhow]

ledger/Cargo.toml

@@ -112,7 +112,8 @@ path = "../synthesizer"
 version = "=1.1.0"
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.anyhow]

ledger/benches/transaction.rs

@@ -24,16 +24,21 @@ use console::{
     program::{Plaintext, Record, Value},
 };
 use ledger_block::Transition;
-use ledger_store::{ConsensusStore, helpers::memory::ConsensusMemory};
+use ledger_store::ConsensusStore;
 use synthesizer::{VM, program::Program};
 
 use criterion::Criterion;
 use indexmap::IndexMap;
 
+#[cfg(not(feature = "rocks"))]
+type LedgerType<N> = ledger_store::helpers::memory::ConsensusMemory<N>;
+#[cfg(feature = "rocks")]
+type LedgerType<N> = ledger_store::helpers::rocksdb::ConsensusDB<N>;
+
 fn initialize_vm<R: Rng + CryptoRng>(
     private_key: &PrivateKey<MainnetV0>,
     rng: &mut R,
-) -> (VM<MainnetV0, ConsensusMemory<MainnetV0>>, Vec<Record<MainnetV0, Plaintext<MainnetV0>>>) {
+) -> (VM<MainnetV0, LedgerType<MainnetV0>>, Vec<Record<MainnetV0, Plaintext<MainnetV0>>>) {
     // Initialize the VM.
     let vm = VM::from(ConsensusStore::open(None).unwrap()).unwrap();
 

ledger/puzzle/Cargo.toml

@@ -47,7 +47,8 @@ path = "../../algorithms"
 version = "=1.1.0"
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.anyhow]

ledger/puzzle/epoch/Cargo.toml

@@ -64,7 +64,8 @@ version = "=1.1.0"
 optional = true
 
 [dependencies.aleo-std]
-version = "0.1.24"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 optional = true
 

ledger/src/get.rs

@@ -292,25 +292,3 @@ impl<N: Network, C: ConsensusStorage<N>> Ledger<N, C> {
             .collect::<Result<_>>()
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::test_helpers::CurrentLedger;
-    use console::network::MainnetV0;
-
-    type CurrentNetwork = MainnetV0;
-
-    #[test]
-    fn test_get_block() {
-        // Load the genesis block.
-        let genesis = Block::from_bytes_le(CurrentNetwork::genesis_bytes()).unwrap();
-
-        // Initialize a new ledger.
-        let ledger = CurrentLedger::load(genesis.clone(), StorageMode::Production).unwrap();
-        // Retrieve the genesis block.
-        let candidate = ledger.get_block(0).unwrap();
-        // Ensure the genesis block matches.
-        assert_eq!(genesis, candidate);
-    }
-}

ledger/src/lib.rs

@@ -390,7 +390,6 @@ pub(crate) mod test_helpers {
         network::MainnetV0,
         prelude::*,
     };
-    use ledger_block::Block;
     use ledger_store::ConsensusStore;
     use snarkvm_circuit::network::AleoV0;
     use synthesizer::vm::VM;
@@ -430,10 +429,6 @@ pub(crate) mod test_helpers {
         TestEnv { ledger, private_key, view_key, address }
     }
 
-    pub(crate) fn sample_genesis_block() -> Block<CurrentNetwork> {
-        Block::<CurrentNetwork>::from_bytes_le(CurrentNetwork::genesis_bytes()).unwrap()
-    }
-
     pub(crate) fn sample_ledger(
         private_key: PrivateKey<CurrentNetwork>,
         rng: &mut (impl Rng + CryptoRng),

ledger/src/tests.rs

@@ -30,7 +30,7 @@ use ledger_authority::Authority;
 use ledger_block::{Block, ConfirmedTransaction, Execution, Ratify, Rejected, Transaction};
 use ledger_committee::{Committee, MIN_VALIDATOR_STAKE};
 use ledger_narwhal::{BatchCertificate, BatchHeader, Data, Subdag, Transmission, TransmissionID};
-use ledger_store::{ConsensusStore, helpers::memory::ConsensusMemory};
+use ledger_store::ConsensusStore;
 use snarkvm_utilities::try_vm_runtime;
 use synthesizer::{Stack, program::Program, vm::VM};
 
@@ -39,9 +39,14 @@ use rand::seq::SliceRandom;
 use std::collections::{BTreeMap, HashMap};
 use time::OffsetDateTime;
 
+#[cfg(not(feature = "rocks"))]
+type LedgerType<N> = ledger_store::helpers::memory::ConsensusMemory<N>;
+#[cfg(feature = "rocks")]
+type LedgerType<N> = ledger_store::helpers::rocksdb::ConsensusDB<N>;
+
 /// Initializes a sample VM.
-fn sample_vm() -> VM<CurrentNetwork, ConsensusMemory<CurrentNetwork>> {
-    VM::from(ConsensusStore::<CurrentNetwork, ConsensusMemory<CurrentNetwork>>::open(None).unwrap()).unwrap()
+fn sample_vm() -> VM<CurrentNetwork, LedgerType<CurrentNetwork>> {
+    VM::from(ConsensusStore::<CurrentNetwork, LedgerType<CurrentNetwork>>::open(None).unwrap()).unwrap()
 }
 
 /// Extract the transmissions from a block.
@@ -71,8 +76,7 @@ fn construct_quorum_blocks(
 ) -> Vec<Block<CurrentNetwork>> {
     // Initialize the ledger with the genesis block.
     let ledger =
-        Ledger::<CurrentNetwork, ConsensusMemory<CurrentNetwork>>::load(genesis.clone(), StorageMode::Production)
-            .unwrap();
+        Ledger::<CurrentNetwork, LedgerType<CurrentNetwork>>::load(genesis.clone(), StorageMode::Production).unwrap();
 
     // Initialize the round parameters.
     assert!(num_blocks > 0);
@@ -121,7 +125,7 @@ fn construct_quorum_blocks(
 
     // Helper function to create a quorum block.
     fn create_next_quorum_block(
-        ledger: &Ledger<CurrentNetwork, ConsensusMemory<CurrentNetwork>>,
+        ledger: &Ledger<CurrentNetwork, LedgerType<CurrentNetwork>>,
         round: u64,
         leader_certificate: &BatchCertificate<CurrentNetwork>,
         previous_leader_certificate: Option<&BatchCertificate<CurrentNetwork>>,
@@ -182,7 +186,7 @@ fn test_load() {
     // Sample the genesis private key.
     let private_key = PrivateKey::<CurrentNetwork>::new(rng).unwrap();
     // Initialize the store.
-    let store = ConsensusStore::<_, ConsensusMemory<_>>::open(None).unwrap();
+    let store = ConsensusStore::<_, LedgerType<_>>::open(None).unwrap();
     // Create a genesis block.
     let genesis = VM::from(store).unwrap().genesis_beacon(&private_key, rng).unwrap();
 
@@ -196,8 +200,14 @@ fn test_load() {
 
 #[test]
 fn test_load_unchecked() {
-    // Load the genesis block.
-    let genesis = crate::test_helpers::sample_genesis_block();
+    let rng = &mut TestRng::default();
+
+    // Sample the genesis private key.
+    let private_key = PrivateKey::<CurrentNetwork>::new(rng).unwrap();
+    // Initialize the store.
+    let store = ConsensusStore::<_, LedgerType<_>>::open(None).unwrap();
+    // Create a genesis block.
+    let genesis = VM::from(store).unwrap().genesis_beacon(&private_key, rng).unwrap();
 
     // Initialize the ledger without checks.
     let ledger = CurrentLedger::load_unchecked(genesis.clone(), StorageMode::Production).unwrap();
@@ -214,6 +224,25 @@ fn test_load_unchecked() {
     assert_eq!(ledger.latest_block(), genesis);
 }
 
+#[test]
+fn test_get_block() {
+    let rng = &mut TestRng::default();
+
+    // Sample the genesis private key.
+    let private_key = PrivateKey::<CurrentNetwork>::new(rng).unwrap();
+    // Initialize the store.
+    let store = ConsensusStore::<_, LedgerType<_>>::open(None).unwrap();
+    // Create a genesis block.
+    let genesis = VM::from(store).unwrap().genesis_beacon(&private_key, rng).unwrap();
+
+    // Initialize a new ledger.
+    let ledger = CurrentLedger::load(genesis.clone(), StorageMode::Production).unwrap();
+    // Retrieve the genesis block.
+    let candidate = ledger.get_block(0).unwrap();
+    // Ensure the genesis block matches.
+    assert_eq!(genesis, candidate);
+}
+
 #[test]
 fn test_state_path() {
     let rng = &mut TestRng::default();
@@ -1990,8 +2019,7 @@ fn test_max_committee_limit_with_bonds() {
 
     // Initialize a Ledger from the genesis block.
     let ledger =
-        Ledger::<CurrentNetwork, ConsensusMemory<CurrentNetwork>>::load(genesis_block, StorageMode::Production)
-            .unwrap();
+        Ledger::<CurrentNetwork, LedgerType<CurrentNetwork>>::load(genesis_block, StorageMode::Production).unwrap();
 
     // Bond the first validator.
     let bond_first_transaction = ledger
@@ -3050,7 +3078,7 @@ fn test_forged_block_subdags() {
     // Sample the genesis private key.
     let private_key = PrivateKey::<CurrentNetwork>::new(rng).unwrap();
     // Initialize the store.
-    let store = ConsensusStore::<_, ConsensusMemory<_>>::open(None).unwrap();
+    let store = ConsensusStore::<_, LedgerType<_>>::open(None).unwrap();
     // Create a genesis block with a seeded RNG to reproduce the same genesis private keys.
     let seed: u64 = rng.gen();
     let genesis_rng = &mut TestRng::from_seed(seed);
@@ -3074,8 +3102,7 @@ fn test_forged_block_subdags() {
     let block_3 = quorum_blocks.remove(0);
 
     // Construct the ledger.
-    let ledger =
-        Ledger::<CurrentNetwork, ConsensusMemory<CurrentNetwork>>::load(genesis, StorageMode::Production).unwrap();
+    let ledger = Ledger::<CurrentNetwork, LedgerType<CurrentNetwork>>::load(genesis, StorageMode::Production).unwrap();
     ledger.advance_to_next_block(&block_1).unwrap();
     ledger.check_next_block(&block_2, rng).unwrap();
 

ledger/store/Cargo.toml

@@ -80,7 +80,8 @@ path = "../../synthesizer/snark"
 version = "=1.1.0"
 
 [dependencies.aleo-std-storage]
-version = "0.1.7"
+git = "https://github.com/ljedrz/aleo-std"
+branch = "feat/test_storage_mode"
 default-features = false
 
 [dependencies.anyhow]
@@ -136,11 +137,8 @@ features = [ "test-helpers" ]
 package = "snarkvm-ledger-test-helpers"
 path = "../../ledger/test-helpers"
 
-[dev-dependencies.serial_test]
-version = "2"
-
 [dev-dependencies.tempfile]
-version = "3.8"
+version = "3.15"
 
 [dev-dependencies.tracing-test]
 version = "0.2"

ledger/store/src/block/mod.rs

@@ -146,7 +146,7 @@ pub trait BlockStorage<N: Network>: 'static + Clone + Send + Sync {
     type TransitionStorage: TransitionStorage<N>;
 
     /// Initializes the block storage.
-    fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self>;
+    fn open<S: Into<StorageMode>>(storage: S) -> Result<Self>;
 
     /// Returns the state root map.
     fn state_root_map(&self) -> &Self::StateRootMap;
@@ -1003,7 +1003,7 @@ pub struct BlockStore<N: Network, B: BlockStorage<N>> {
 
 impl<N: Network, B: BlockStorage<N>> BlockStore<N, B> {
     /// Initializes the block store.
-    pub fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self> {
+    pub fn open<S: Into<StorageMode>>(storage: S) -> Result<Self> {
         // Initialize the block storage.
         let storage = B::open(storage)?;
 

ledger/store/src/consensus/mod.rs

@@ -41,7 +41,7 @@ pub trait ConsensusStorage<N: Network>: 'static + Clone + Send + Sync {
     type TransitionStorage: TransitionStorage<N>;
 
     /// Initializes the consensus storage.
-    fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self>;
+    fn open<S: Into<StorageMode>>(storage: S) -> Result<Self>;
 
     /// Returns the finalize storage.
     fn finalize_store(&self) -> &FinalizeStore<N, Self::FinalizeStorage>;
@@ -115,9 +115,9 @@ pub struct ConsensusStore<N: Network, C: ConsensusStorage<N>> {
 
 impl<N: Network, C: ConsensusStorage<N>> ConsensusStore<N, C> {
     /// Initializes the consensus store.
-    pub fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self> {
+    pub fn open<S: Into<StorageMode>>(storage: S) -> Result<Self> {
         // Initialize the consensus storage.
-        let storage = C::open(storage.clone())?;
+        let storage = C::open(storage.into())?;
         // Return the consensus store.
         Ok(Self { storage, _phantom: PhantomData })
     }

ledger/store/src/helpers/memory/block.rs

@@ -94,7 +94,7 @@ impl<N: Network> BlockStorage<N> for BlockMemory<N> {
     type TransitionStorage = TransitionMemory<N>;
 
     /// Initializes the block storage.
-    fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self> {
+    fn open<S: Into<StorageMode>>(storage: S) -> Result<Self> {
         // Initialize the transition store.
         let transition_store = TransitionStore::<N, TransitionMemory<N>>::open(storage)?;
         // Initialize the transaction store.

ledger/store/src/helpers/memory/consensus.rs

@@ -40,7 +40,8 @@ impl<N: Network> ConsensusStorage<N> for ConsensusMemory<N> {
     type TransitionStorage = TransitionMemory<N>;
 
     /// Initializes the consensus storage.
-    fn open<S: Clone + Into<StorageMode>>(storage: S) -> Result<Self> {
+    fn open<S: Into<StorageMode>>(storage: S) -> Result<Self> {
+        let storage = storage.into();
         // Initialize the finalize store.
         let finalize_store = FinalizeStore::<N, FinalizeMemory<N>>::open(storage.clone())?;
         // Initialize the block store.