[Tests] Jts timeout fix (#1207)

* typos fix
* increased bootstrap & transaction wait
* changed bootstrap sequence for some tests

Author: dkijania

jormungandr-scenario-tests/src/node.rs

@@ -65,7 +65,7 @@ error_chain! {
 
         FragmentIsPendingForTooLong (fragment_id: FragmentId, duration: Duration) {
             description("fragment is pending for too long"),
-            display("fragment '{}' is pending for tool long ({} s)", fragment_id, duration.as_secs()),
+            display("fragment '{}' is pending for too long ({} s)", fragment_id, duration.as_secs()),
         }
     }
 }
@@ -284,7 +284,7 @@ impl NodeController {
     }
 
     pub fn wait_fragment(&self, duration: Duration, check: MemPoolCheck) -> Result<FragmentStatus> {
-        let max_try = 20;
+        let max_try = 50;
         for _ in 0..max_try {
             let logs = self.fragment_logs()?;
 
@@ -335,8 +335,8 @@ impl NodeController {
     }
 
     pub fn wait_for_bootstrap(&self) -> Result<()> {
-        let max_try = 20;
-        let sleep = Duration::from_secs(1);
+        let max_try = 40;
+        let sleep = Duration::from_secs(2);
         for _ in 0..max_try {
             let stats = self.stats();
             if let Ok(stats) = stats {

jormungandr-scenario-tests/src/test/comm/passive_leader.rs

@@ -34,9 +34,9 @@ pub fn transaction_to_passive(mut context: Context<ChaChaRng>) -> Result<Scenari
     controller.monitor_nodes();
     let leader =
         controller.spawn_node(LEADER, LeadershipMode::Leader, PersistenceMode::InMemory)?;
+    leader.wait_for_bootstrap()?;
     let passive =
         controller.spawn_node(PASSIVE, LeadershipMode::Passive, PersistenceMode::InMemory)?;
-    leader.wait_for_bootstrap()?;
     passive.wait_for_bootstrap()?;
 
     let mut wallet1 = controller.wallet("unassigned1")?;
@@ -153,12 +153,13 @@ pub fn passive_node_is_updated(mut context: Context<ChaChaRng>) -> Result<Scenar
     let mut controller = scenario_settings.build(context)?;
 
     controller.monitor_nodes();
-    let passive =
-        controller.spawn_node(PASSIVE, LeadershipMode::Passive, PersistenceMode::InMemory)?;
+
     let leader =
         controller.spawn_node(LEADER, LeadershipMode::Leader, PersistenceMode::InMemory)?;
-
     leader.wait_for_bootstrap()?;
+
+    let passive =
+        controller.spawn_node(PASSIVE, LeadershipMode::Passive, PersistenceMode::InMemory)?;
     passive.wait_for_bootstrap()?;
 
     let mut wallet1 = controller.wallet("unassigned1")?;

jormungandr-scenario-tests/src/test/network/topology/scenarios.rs

@@ -15,6 +15,7 @@ const LEADER_5: &str = "Leader5";
 const LEADER_6: &str = "Leader6";
 const LEADER_7: &str = "Leader7";
 
+const CORE_NODE: &str = "Core";
 const RELAY_NODE_1: &str = "Relay1";
 const RELAY_NODE_2: &str = "Relay2";
 
@@ -412,8 +413,9 @@ pub fn relay(mut context: Context<ChaChaRng>) -> Result<ScenarioResult> {
         "T3007-Relay",
         &mut context,
         topology [
-            RELAY_NODE_1 -> RELAY_NODE_2,
-            RELAY_NODE_2 -> RELAY_NODE_1,
+            CORE_NODE,
+            RELAY_NODE_1 -> CORE_NODE,
+            RELAY_NODE_2 -> CORE_NODE,
             LEADER_1 -> RELAY_NODE_1,
             LEADER_2 -> RELAY_NODE_1,
             LEADER_3 -> RELAY_NODE_1,
@@ -441,6 +443,26 @@ pub fn relay(mut context: Context<ChaChaRng>) -> Result<ScenarioResult> {
 
     let mut controller = scenario_settings.build(context.clone())?;
 
+    let core =
+        controller.spawn_node(CORE_NODE, LeadershipMode::Leader, PersistenceMode::InMemory)?;
+
+    controller.monitor_nodes();
+    core.wait_for_bootstrap()?;
+
+    let relay1 = controller.spawn_node(
+        RELAY_NODE_1,
+        LeadershipMode::Passive,
+        PersistenceMode::InMemory,
+    )?;
+    let relay2 = controller.spawn_node(
+        RELAY_NODE_2,
+        LeadershipMode::Passive,
+        PersistenceMode::InMemory,
+    )?;
+
+    relay2.wait_for_bootstrap()?;
+    relay1.wait_for_bootstrap()?;
+
     let leader1 =
         controller.spawn_node(LEADER_1, LeadershipMode::Leader, PersistenceMode::InMemory)?;
     let leader2 =
@@ -455,21 +477,7 @@ pub fn relay(mut context: Context<ChaChaRng>) -> Result<ScenarioResult> {
         controller.spawn_node(LEADER_6, LeadershipMode::Leader, PersistenceMode::InMemory)?;
     let leader7 =
         controller.spawn_node(LEADER_7, LeadershipMode::Leader, PersistenceMode::InMemory)?;
-    let relay1 = controller.spawn_node(
-        RELAY_NODE_1,
-        LeadershipMode::Passive,
-        PersistenceMode::InMemory,
-    )?;
-    let relay2 = controller.spawn_node(
-        RELAY_NODE_2,
-        LeadershipMode::Passive,
-        PersistenceMode::InMemory,
-    )?;
 
-    controller.monitor_nodes();
-
-    relay2.wait_for_bootstrap()?;
-    relay1.wait_for_bootstrap()?;
     leader7.wait_for_bootstrap()?;
     leader6.wait_for_bootstrap()?;
     leader5.wait_for_bootstrap()?;

jormungandr-scenario-tests/src/test/utils/mod.rs

@@ -43,12 +43,12 @@ pub fn assert_are_in_sync(nodes: Vec<&NodeController>) -> Result<()> {
         assert_equals(
             &expected_block_hashes,
             &all_block_hashes,
-            "nodes are out of sync (different bock hashes)",
+            "nodes are out of sync (different block hashes)",
         )?;
         assert_equals(
             &block_height,
             &node.stats()?.last_block_height,
-            "nodes are out of sync (different bock height)",
+            "nodes are out of sync (different block height)",
         )?;
     }
     Ok(())