fix some flaky tests

Author: domZippilli

lightning/src/util/persist.rs

@@ -290,7 +290,7 @@ impl From<OutPoint> for MonitorName {
 }
 
 /// A struct representing a name for an update.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, PartialOrd, Eq, Ord)]
 pub struct UpdateName(String);
 
 impl UpdateName {
@@ -684,6 +684,13 @@ mod tests {
         assert!(persister.kv.remove("namespace", "key",).is_err());
     }
 
+	fn is_sorted<T>(data: &[T]) -> bool
+	where
+		T: Ord,
+	{
+		data.windows(2).all(|w| w[0] <= w[1])
+	}
+
     // =================================
     // TESTS
     // =================================
@@ -748,8 +755,8 @@ mod tests {
         // Test that these monitors are found where they should be.
         let listed_monitor_names = persister.list_monitor_names().unwrap();
         assert_eq!(listed_monitor_names.len(), 2);
-        assert_eq!(listed_monitor_names[0].0, "deadb33f_0");
-        assert_eq!(listed_monitor_names[1].0, "feedbeef_1");
+        assert!(listed_monitor_names.iter().any(|m| m.0 == "deadb33f_0"));
+        assert!(listed_monitor_names.iter().any(|m| m.0 == "feedbeef_1"));
     }
 
     #[test]
@@ -786,28 +793,20 @@ mod tests {
             index: 1,
         };
         let monitor_name = MonitorName::try_from(outpoint).unwrap();
-        // Write a fake update at the expected location
-        persister
-            .kv
-            .write(
-                &persister.monitor_update_namespace(&monitor_name),
-                "00000000000000000021",
-                &[0],
-            )
-            .unwrap();
-        persister
+		for i in 2..=1000 { 
+			persister
             .kv
             .write(
                 &persister.monitor_update_namespace(&monitor_name),
-                "00000000000000000022",
+                &UpdateName::from(i).storage_key(),
                 &[0],
             )
             .unwrap();
+		}
         // Check that we get the right number of updates, in order
         let listed_update_names = persister.list_update_names(&monitor_name).unwrap();
-        assert_eq!(listed_update_names.len(), 2);
-        assert_eq!(listed_update_names[0].0, "00000000000000000021");
-        assert_eq!(listed_update_names[1].0, "00000000000000000022");
+        assert_eq!(listed_update_names.len(), 999);
+		assert!(is_sorted(&listed_update_names));
     }
 
     #[test]