f Make TestSyncStore more robust

Author: tnull

src/io/test_utils.rs

@@ -15,6 +15,7 @@ use lightning::{check_added_monitors, check_closed_broadcast, check_closed_event
 
 use std::panic::RefUnwindSafe;
 use std::path::PathBuf;
+use std::sync::RwLock;
 
 pub(crate) fn do_read_write_remove_list_persist<K: KVStore + RefUnwindSafe>(kv_store: &K) {
 	let data = [42u8; 32];
@@ -174,13 +175,15 @@ pub(crate) fn do_test_store<K: KVStore>(store_0: &K, store_1: &K) {
 
 // A `KVStore` impl for testing purposes that wraps all our `KVStore`s and asserts their synchronicity.
 pub(crate) struct TestSyncStore {
+	serializer: RwLock<()>,
 	test_store: TestStore,
 	fs_store: FilesystemStore,
 	sqlite_store: SqliteStore,
 }
 
 impl TestSyncStore {
 	pub(crate) fn new(dest_dir: PathBuf) -> Self {
+		let serializer = RwLock::new(());
 		let mut fs_dir = dest_dir.clone();
 		fs_dir.push("fs_store");
 		let fs_store = FilesystemStore::new(fs_dir);
@@ -193,12 +196,41 @@ impl TestSyncStore {
 		)
 		.unwrap();
 		let test_store = TestStore::new();
-		Self { fs_store, sqlite_store, test_store }
+		Self { serializer, fs_store, sqlite_store, test_store }
+	}
+
+	fn do_list(&self, namespace: &str, sub_namespace: &str) -> std::io::Result<Vec<String>> {
+		let fs_res = self.fs_store.list(namespace, sub_namespace);
+		let sqlite_res = self.sqlite_store.list(namespace, sub_namespace);
+		let test_res = self.test_store.list(namespace, sub_namespace);
+
+		match fs_res {
+			Ok(mut list) => {
+				list.sort();
+
+				let mut sqlite_list = sqlite_res.unwrap();
+				sqlite_list.sort();
+				assert_eq!(list, sqlite_list);
+
+				let mut test_list = test_res.unwrap();
+				test_list.sort();
+				assert_eq!(list, test_list);
+
+				Ok(list)
+			}
+			Err(e) => {
+				assert!(sqlite_res.is_err());
+				assert!(test_res.is_err());
+				Err(e)
+			}
+		}
 	}
 }
 
 impl KVStore for TestSyncStore {
 	fn read(&self, namespace: &str, sub_namespace: &str, key: &str) -> std::io::Result<Vec<u8>> {
+		let _guard = self.serializer.read().unwrap();
+
 		let fs_res = self.fs_store.read(namespace, sub_namespace, key);
 		let sqlite_res = self.sqlite_store.read(namespace, sub_namespace, key);
 		let test_res = self.test_store.read(namespace, sub_namespace, key);
@@ -222,11 +254,12 @@ impl KVStore for TestSyncStore {
 	fn write(
 		&self, namespace: &str, sub_namespace: &str, key: &str, buf: &[u8],
 	) -> std::io::Result<()> {
+		let _guard = self.serializer.write().unwrap();
 		let fs_res = self.fs_store.write(namespace, sub_namespace, key, buf);
 		let sqlite_res = self.sqlite_store.write(namespace, sub_namespace, key, buf);
 		let test_res = self.test_store.write(namespace, sub_namespace, key, buf);
 
-		assert!(self.list(namespace, sub_namespace).unwrap().contains(&key.to_string()));
+		assert!(self.do_list(namespace, sub_namespace).unwrap().contains(&key.to_string()));
 
 		match fs_res {
 			Ok(()) => {
@@ -245,11 +278,12 @@ impl KVStore for TestSyncStore {
 	fn remove(
 		&self, namespace: &str, sub_namespace: &str, key: &str, lazy: bool,
 	) -> std::io::Result<()> {
+		let _guard = self.serializer.write().unwrap();
 		let fs_res = self.fs_store.remove(namespace, sub_namespace, key, lazy);
 		let sqlite_res = self.sqlite_store.remove(namespace, sub_namespace, key, lazy);
 		let test_res = self.test_store.remove(namespace, sub_namespace, key, lazy);
 
-		assert!(!self.list(namespace, sub_namespace).unwrap().contains(&key.to_string()));
+		assert!(!self.do_list(namespace, sub_namespace).unwrap().contains(&key.to_string()));
 
 		match fs_res {
 			Ok(()) => {
@@ -266,29 +300,7 @@ impl KVStore for TestSyncStore {
 	}
 
 	fn list(&self, namespace: &str, sub_namespace: &str) -> std::io::Result<Vec<String>> {
-		let fs_res = self.fs_store.list(namespace, sub_namespace);
-		let sqlite_res = self.sqlite_store.list(namespace, sub_namespace);
-		let test_res = self.test_store.list(namespace, sub_namespace);
-
-		match fs_res {
-			Ok(mut list) => {
-				list.sort();
-
-				let mut sqlite_list = sqlite_res.unwrap();
-				sqlite_list.sort();
-				assert_eq!(list, sqlite_list);
-
-				let mut test_list = test_res.unwrap();
-				test_list.sort();
-				assert_eq!(list, test_list);
-
-				Ok(list)
-			}
-			Err(e) => {
-				assert!(sqlite_res.is_err());
-				assert!(test_res.is_err());
-				Err(e)
-			}
-		}
+		let _guard = self.serializer.read().unwrap();
+		self.do_list(namespace, sub_namespace)
 	}
 }