fix explorer_vote_tally_certificate_test test

input-output-hk · Nov 22, 2022 · 990b27f · 990b27f
1 parent 6b7e4d8
commit 990b27f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/...ormungandr/testing/jormungandr-integration-tests/src/jormungandr/explorer/certificates.rs b/...ormungandr/testing/jormungandr-integration-tests/src/jormungandr/explorer/certificates.rs
@@ -708,7 +708,7 @@ pub fn explorer_vote_tally_certificate_test() {
 
     let fragment_sender = FragmentSender::from(&jormungandr.rest().settings().unwrap());
 
-    let fragment_builder = FragmentBuilder::from_settings(
+    let mut fragment_builder = FragmentBuilder::from_settings(
         &jormungandr.rest().settings().unwrap(),
         BlockDate::first().next_epoch(),
     );
@@ -729,6 +729,7 @@ pub fn explorer_vote_tally_certificate_test() {
 
     wait_for_epoch(1, jormungandr.rest());
 
+    fragment_builder.update_valid_until(BlockDate::first().next_epoch().next_epoch());
     let vote_tally_fragment =
         fragment_builder.vote_tally(&alice, &vote_plan, VoteTallyPayload::Public);
 

diff --git a/src/jormungandr/testing/loki/src/sender.rs b/src/jormungandr/testing/loki/src/sender.rs
@@ -24,7 +24,7 @@ use rand::{thread_rng, Rng};
 use std::{path::PathBuf, time::Duration};
 use thor::{
     BlockDateGenerator, DummySyncNode, FragmentBuilderError, FragmentExporter,
-    FragmentExporterError, FragmentVerifier, Wallet,
+    FragmentExporterError, FragmentVerifier, VerifyExitStrategy, Wallet,
 };
 
 /// Send malformed transactions
@@ -337,7 +337,7 @@ impl<'a, S: SyncNode + Send> AdversaryFragmentSender<'a, S> {
         match FragmentVerifier::wait_fragment(
             Duration::from_secs(2),
             check.clone(),
-            Default::default(),
+            VerifyExitStrategy::OnProcessed,
             node,
         )? {
             FragmentStatus::Rejected { .. } => Ok(()),

diff --git a/src/jormungandr/testing/thor/src/cli/controller.rs b/src/jormungandr/testing/thor/src/cli/controller.rs
@@ -4,7 +4,7 @@ use crate::{
         config::{ConfigManager, WalletState},
         Connection,
     },
-    FragmentSender, FragmentVerifier, Wallet,
+    FragmentSender, FragmentVerifier, VerifyExitStrategy, Wallet,
 };
 use bech32::{u5, FromBase32};
 use chain_crypto::{Ed25519Extended, SecretKey};
@@ -151,7 +151,7 @@ impl CliController {
             FragmentVerifier::wait_fragment(
                 Duration::from_secs(settings.slot_duration * SLOT_COUNT),
                 check.clone(),
-                Default::default(),
+                VerifyExitStrategy::OnProcessed,
                 &node,
             )?;
             self.wallets.wallet_mut()?.spending_counters = thor_wallet

diff --git a/src/jormungandr/testing/thor/src/fragment/mod.rs b/src/jormungandr/testing/thor/src/fragment/mod.rs
@@ -96,6 +96,10 @@ impl FragmentBuilder {
         }
     }
 
+    pub fn update_valid_until(&mut self, valid_until: BlockDate) {
+        self.valid_until = valid_until;
+    }
+
     pub fn witness_mode(mut self, witness_mode: WitnessMode) -> Self {
         self.fragment_factory = self.fragment_factory.witness_mode(witness_mode);
         self

diff --git a/src/jormungandr/testing/thor/src/fragment/sender.rs b/src/jormungandr/testing/thor/src/fragment/sender.rs
@@ -1,6 +1,7 @@
 use super::{FragmentExporter, FragmentExporterError};
 use crate::{
-    DummySyncNode, FragmentBuilder, FragmentSenderSetup, FragmentVerifier, StakePool, Wallet,
+    DummySyncNode, FragmentBuilder, FragmentSenderSetup, FragmentVerifier, StakePool,
+    VerifyExitStrategy, Wallet,
 };
 use chain_core::property::Fragment as _;
 use chain_crypto::{Ed25519, SecretKey};
@@ -583,7 +584,7 @@ impl<'a, S: SyncNode + Send> FragmentSender<'a, S> {
         match FragmentVerifier::wait_fragment(
             Duration::from_secs(2),
             check.clone(),
-            Default::default(),
+            VerifyExitStrategy::OnProcessed,
             node,
         )? {
             FragmentStatus::Rejected { reason } => Err(FragmentSenderError::FragmentNotInBlock {

diff --git a/src/jormungandr/testing/thor/src/fragment/verifier.rs b/src/jormungandr/testing/thor/src/fragment/verifier.rs
@@ -126,7 +126,7 @@ impl FragmentVerifier {
         node: &A,
     ) -> Result<(), FragmentVerifierError> {
         for check in checks {
-            let status = Self::wait_fragment(duration, check, Default::default(), node)?;
+            let status = Self::wait_fragment(duration, check, ExitStrategy::OnProcessed, node)?;
             Self::is_in_block(status, node)?;
         }
         Ok(())
@@ -137,7 +137,7 @@ impl FragmentVerifier {
         check: MemPoolCheck,
         node: &A,
     ) -> Result<(), FragmentVerifierError> {
-        let status = Self::wait_fragment(duration, check, Default::default(), node)?;
+        let status = Self::wait_fragment(duration, check, ExitStrategy::OnProcessed, node)?;
         Self::is_in_block(status, node)
     }
 
@@ -146,7 +146,7 @@ impl FragmentVerifier {
         check: MemPoolCheck,
         node: &A,
     ) -> Result<(), FragmentVerifierError> {
-        let status = Self::wait_fragment(duration, check, Default::default(), node)?;
+        let status = Self::wait_fragment(duration, check, ExitStrategy::OnProcessed, node)?;
         Self::is_rejected(status, node)
     }
 
@@ -156,7 +156,7 @@ impl FragmentVerifier {
         message: S,
         node: &A,
     ) -> Result<(), FragmentVerifierError> {
-        let status = Self::wait_fragment(duration, check, Default::default(), node)?;
+        let status = Self::wait_fragment(duration, check, ExitStrategy::OnProcessed, node)?;
         Self::is_rejected_with_message(status, message, node)
     }
 
@@ -315,9 +315,3 @@ pub enum ExitStrategy {
     /// Exit when the fragment has been processed (i.e. either Rejected or InABlock)
     OnProcessed,
 }
-
-impl Default for ExitStrategy {
-    fn default() -> Self {
-        ExitStrategy::OnProcessed
-    }
-}