fixup! 2beccfa

Author: f3r10

simln-lib/src/lib.rs

@@ -1621,6 +1621,7 @@ mod tests {
     use std::time::Duration;
     use tokio::sync::Mutex;
     use tokio_util::task::TaskTracker;
+    use std::sync::Mutex as StdMutex;
 
     #[test]
     fn create_seeded_mut_rng() {
@@ -1947,6 +1948,8 @@ mod tests {
         let node_1 = &nodes[0];
         let mut mock_node_1 = MockLightningNode::new();
 
+        let payments_list = Arc::new(StdMutex::new(Vec::new()));
+
         // Set up node 1 expectations
         let node_1_clone = node_1.clone();
         mock_node_1
@@ -1967,9 +1970,13 @@ mod tests {
                 payment_outcome: crate::PaymentOutcome::Success,
             })
         });
+        let pl1 = payments_list.clone();
         mock_node_1
             .expect_send_payment()
-            .returning(|_, _| Ok(lightning::ln::PaymentHash([0; 32])));
+            .returning(move |a, _| {
+                pl1.lock().unwrap().push(a);
+                Ok(lightning::ln::PaymentHash([0; 32]))
+            });
 
         clients.insert(node_1.pubkey, Arc::new(Mutex::new(mock_node_1)));
 
@@ -1999,7 +2006,7 @@ mod tests {
         });
         mock_node_2
             .expect_send_payment()
-            .returning(|_, _| Ok(lightning::ln::PaymentHash([1; 32])));
+            .returning(move |_, _| { Ok(lightning::ln::PaymentHash([1; 32])) });
 
         clients.insert(node_2.pubkey, Arc::new(Mutex::new(mock_node_2)));
 
@@ -2027,9 +2034,15 @@ mod tests {
                 payment_outcome: crate::PaymentOutcome::Success,
             })
         });
+        let pl3 = payments_list.clone();
         mock_node_3
             .expect_send_payment()
-            .returning(|_, _| Ok(lightning::ln::PaymentHash([2; 32])));
+            .returning(move |a, _| 
+                {
+                    pl3.lock().unwrap().push(a);
+                    Ok(lightning::ln::PaymentHash([2; 32]))
+                }
+                );
 
         clients.insert(node_3.pubkey, Arc::new(Mutex::new(mock_node_3)));
 
@@ -2059,7 +2072,7 @@ mod tests {
         });
         mock_node_4
             .expect_send_payment()
-            .returning(|_, _| Ok(lightning::ln::PaymentHash([3; 32])));
+            .returning(move |_, _| { Ok(lightning::ln::PaymentHash([3; 32])) });
 
         clients.insert(node_4.pubkey, Arc::new(Mutex::new(mock_node_4)));
 
@@ -2069,7 +2082,7 @@ mod tests {
             source: node_1.clone(),
             destination: node_2.clone(),
             start_secs: None,
-            count: Some(10),                               // 10 payments
+            count: Some(5),                               // 10 payments
             interval_secs: crate::ValueOrRange::Value(2),  // 2 second interval
             amount_msat: crate::ValueOrRange::Value(2000), // 2000 msats
         };
@@ -2079,7 +2092,7 @@ mod tests {
             source: node_3.clone(),
             destination: node_4.clone(),
             start_secs: None,
-            count: Some(10),                               // 10 payments
+            count: Some(5),                               // 10 payments
             interval_secs: crate::ValueOrRange::Value(4),  // 4 second interval
             amount_msat: crate::ValueOrRange::Value(3000), // 3000 msats
         };
@@ -2106,21 +2119,18 @@ mod tests {
         let start = std::time::Instant::now();
         let _ = simulation.run(&vec![activity_1, activity_2]).await;
         let elapsed = start.elapsed();
+        
+        let expected_payment_list = vec![node_2.pubkey, node_2.pubkey, node_4.pubkey, node_2.pubkey, node_4.pubkey, node_2.pubkey, node_4.pubkey, node_2.pubkey, node_4.pubkey, node_4.pubkey]; 
 
-        // Check that simulation ran 60 because
-        // from activity_1 there are 10 payments with a wait_time of 2s -> 20s
-        // from activity_2 there are 10 payments with a wait_time of 4s -> 40s
+        // Check that simulation ran 30 because
+        // from activity_1 there are 5 payments with a wait_time of 2s -> 10s
+        // from activity_2 there are 5 payments with a wait_time of 4s -> 20s
         assert!(
-            elapsed >= Duration::from_secs(60),
-            "Simulation should have run at least for 54s, took {:?}",
+            elapsed >= Duration::from_secs(30),
+            "Simulation should have run at least for 30s, took {:?}",
             elapsed
         );
 
-        let payments = simulation.get_total_payments().await;
-
-        // We expect 20 payments to be completed
-        // from activity_1 there are 10 payments
-        // from activity_2 there are 10 payments
-        assert!(payments == 20, "Expected 20 payments, got {:?}", payments);
+        assert!(payments_list.lock().unwrap().as_ref() == expected_payment_list, "The expected order of payments is not correct");
     }
 }