fix tests

Author: dkijania

src/vit-testing/mainnet-lib/src/cardano_node/in_memory.rs

@@ -72,8 +72,18 @@ impl InMemoryNode {
     /// On accessing ledger state
     #[must_use]
     pub fn start(block0: Block0) -> Self {
-        let slot_duration = block0.settings.slot_duration;
-        let shared_ledger: Arc<RwLock<Ledger>> = Arc::new(RwLock::new(Ledger::new(block0)));
+        Self::start_from_ledger(Ledger::new(block0))
+    }
+
+    /// Starts node process from ledger
+    ///
+    /// # Panics
+    ///
+    /// On accessing ledger state
+    #[must_use]
+    pub fn start_from_ledger(ledger: Ledger) -> Self {
+        let slot_duration = ledger.settings().slot_duration;
+        let shared_ledger: Arc<RwLock<Ledger>> = Arc::new(RwLock::new(ledger));
         let shared_block_notifier = SharedPharos::default();
 
         let ledger = shared_ledger.clone();

src/vit-testing/mainnet-lib/src/db_sync/in_memory.rs

@@ -1,4 +1,4 @@
-use crate::InMemoryNode;
+use crate::{Block0, InMemoryNode};
 use cardano_serialization_lib::metadata::GeneralTransactionMetadata;
 use cardano_serialization_lib::utils::BigNum;
 use cardano_serialization_lib::{Block, Transaction, TransactionWitnessSet};
@@ -45,14 +45,22 @@ pub struct InMemoryDbSync {
     stakes: HashMap<Address, BigNum>,
     settings: Settings,
 }
-
 impl Debug for InMemoryDbSync {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(f, "{:?}", self.settings)
     }
 }
 
 impl InMemoryDbSync {
+
+    /// Creates new instance out of block0
+    #[must_use]
+    pub fn from_block0(block0: &Block0) -> Self {
+        let mut db_sync = InMemoryDbSync::default();
+        db_sync.on_block_propagation(&block0.block);
+        db_sync
+    }
+
     /// Connects to Cardano mock node using simple observer/observable mechanism
     ///
     /// # Panics

src/vit-testing/mainnet-lib/src/network/mod.rs

@@ -2,7 +2,7 @@ pub use crate::cardano_node::settings::Settings;
 use crate::cardano_node::{Block0, BlockBuilder};
 use crate::db_sync::{InMemoryDbSync, SharedInMemoryDbSync};
 use crate::wallet::CardanoWallet;
-use crate::InMemoryNode;
+use crate::{InMemoryNode, Ledger};
 use cardano_serialization_lib::address::Address;
 use cardano_serialization_lib::Transaction;
 use jormungandr_lib::crypto::account::Identifier;
@@ -24,43 +24,19 @@ impl MainnetNetworkBuilder {
         self
     }
 
-    /// Builds dbsync instance and set or representatives identifiers
-    ///
-    /// # Panics
-    ///
-    /// On internal logic issue
+    /// Builds block0
     #[must_use]
-    pub fn in_memory_internal(self) -> (SharedInMemoryDbSync, InMemoryNode, HashSet<Identifier>) {
+    pub fn build_block0(&self) -> Block0 {
         let txs: Vec<_> = self
             .states
             .iter()
             .filter_map(|x| x.registration_tx.clone())
             .collect();
 
-        let block0 = Block0 {
+        Block0 {
             block: BlockBuilder::next_block(None, &txs),
-            settings: self.settings,
-        };
-
-        let mut node = InMemoryNode::start(block0);
-
-        (
-            InMemoryDbSync::default().connect_to_node(&mut node),
-            node,
-            self.states
-                .iter()
-                .map(|x| x.rep.as_ref())
-                .filter(Option::is_some)
-                .map(|x| x.unwrap().clone())
-                .collect(),
-        )
-    }
-
-    /// Builds dbsync instance and set or representatives identifiers
-    #[must_use]
-    pub fn shared(self) -> (SharedInMemoryDbSync, InMemoryNode, HashSet<Identifier>) {
-        let (db_sync, mut node, reps) = self.build();
-        (db_sync.connect_to_node(&mut node), node, reps)
+            settings: self.settings.clone(),
+        }
     }
 
     /// Builds dbsync instance and set or representatives identifiers
@@ -69,23 +45,14 @@ impl MainnetNetworkBuilder {
     ///
     /// On internal logic issue
     #[must_use]
-    pub fn build(self) -> (InMemoryDbSync, InMemoryNode, HashSet<Identifier>) {
-        let txs: Vec<_> = self
-            .states
-            .iter()
-            .filter_map(|x| x.registration_tx.clone())
-            .collect();
-
-        let block0 = Block0 {
-            block: BlockBuilder::next_block(None, &txs),
-            settings: self.settings,
-        };
-
-        let node = InMemoryNode::start(block0);
+    pub fn build(self) -> (InMemoryDbSync, Ledger, HashSet<Identifier>) {
+        let block0 = self.build_block0();
+        let db_sync = InMemoryDbSync::from_block0(&block0);
+        let ledger = Ledger::new(block0);
 
         (
-            InMemoryDbSync::default(),
-            node,
+            db_sync,
+            ledger,
             self.states
                 .iter()
                 .map(|x| x.rep.as_ref())
@@ -94,6 +61,18 @@ impl MainnetNetworkBuilder {
                 .collect(),
         )
     }
+
+    /// Builds dbsync instance and set or representatives identifiers tailored for async usage
+    ///
+    /// # Panics
+    ///
+    /// On internal logic issue
+    #[must_use]
+    pub fn build_shared(self) -> (SharedInMemoryDbSync, InMemoryNode, HashSet<Identifier>) {
+        let (db_sync, ledger, reps) = self.build();
+        let mut node = InMemoryNode::start_from_ledger(ledger);
+        (db_sync.connect_to_node(&mut node),node, reps)
+    }
 }
 
 /// Wallet state builder for Network state builder is a trait which creates nice interface for

src/vit-testing/mainnet-lib/src/wallet/registration.rs

@@ -30,7 +30,7 @@ lazy_static::lazy_static! {
     pub  static ref METADATUM_3: TransactionMetadatum = TransactionMetadatum::new_int(&Int::new_i32(3));
     /// metadatum label 4 constant
     pub  static ref METADATUM_4: TransactionMetadatum = TransactionMetadatum::new_int(&Int::new_i32(4));
-    /// metadatum label 4 constant
+    /// metadatum label 5 constant
     pub  static ref METADATUM_5: TransactionMetadatum = TransactionMetadatum::new_int(&Int::new_i32(5));
 }
 
@@ -115,6 +115,10 @@ impl<'a> RegistrationTransactionBuilder<'a> {
             &METADATUM_4,
             &TransactionMetadatum::new_int(&Int::new(&BigNum::from(self.slot_no))),
         );
+        meta_map.insert(
+            &METADATUM_5,
+            &TransactionMetadatum::new_int(&Int::new(&BigNum::zero())),
+        );
 
         let mut metadata = GeneralTransactionMetadata::new();
         metadata.insert(
@@ -145,7 +149,7 @@ impl<'a> RegistrationTransactionBuilder<'a> {
     pub fn build(self) -> Transaction {
         let metadata = self.build_metadata();
         TransactionBuilder::build_transaction_with_metadata(
-            &self.wallet.address().to_address(),
+            &self.wallet.reward_address().to_address(),
             self.wallet.stake,
             &metadata,
         )