f DRY up test code

Author: tnull

src/io/fs_store.rs

@@ -1,7 +1,7 @@
 #[cfg(target_os = "windows")]
 extern crate winapi;
 
-use super::{get_namespace_and_key_from_prefixed, KVStore};
+use super::*;
 
 use std::collections::HashMap;
 use std::fs;
@@ -257,8 +257,6 @@ impl KVStorePersister for FilesystemStore {
 mod tests {
 	use super::*;
 	use crate::test::utils::random_storage_path;
-	use lightning::util::persist::KVStorePersister;
-	use lightning::util::ser::Readable;
 
 	use proptest::prelude::*;
 	proptest! {
@@ -267,31 +265,8 @@ mod tests {
 			let rand_dir = random_storage_path();
 
 			let fs_store = FilesystemStore::new(rand_dir.into());
-			let namespace = "testspace";
-			let key = "testkey";
 
-			// Test the basic KVStore operations.
-			fs_store.write(namespace, key, &data).unwrap();
-
-			let listed_keys = fs_store.list(namespace).unwrap();
-			assert_eq!(listed_keys.len(), 1);
-			assert_eq!(listed_keys[0], "testkey");
-
-			let mut reader = fs_store.read(namespace, key).unwrap();
-			let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
-			assert_eq!(data, read_data);
-
-			fs_store.remove(namespace, key).unwrap();
-
-			let listed_keys = fs_store.list(namespace).unwrap();
-			assert_eq!(listed_keys.len(), 0);
-
-			// Test KVStorePersister
-			let prefixed_key = format!("{}/{}", namespace, key);
-			fs_store.persist(&prefixed_key, &data).unwrap();
-			let mut reader = fs_store.read(namespace, key).unwrap();
-			let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
-			assert_eq!(data, read_data);
+			do_read_write_remove_list_persist(&data, &fs_store);
 		}
 	}
 }

src/io/mod.rs

@@ -99,3 +99,38 @@ fn get_namespace_and_key_from_prefixed(
 
 	Ok((namespace, key))
 }
+
+#[cfg(test)]
+fn do_read_write_remove_list_persist<K: KVStore>(data: &[u8; 32], kv_store: &K) {
+	use lightning::util::ser::Readable;
+
+	let namespace = "testspace";
+	let key = "testkey";
+
+	// Test the basic KVStore operations.
+	kv_store.write(namespace, key, data).unwrap();
+
+	// Test empty namespace is allowed, but not empty key.
+	kv_store.write("", key, data).unwrap();
+	assert!(kv_store.write(namespace, "", data).is_err());
+
+	let listed_keys = kv_store.list(namespace).unwrap();
+	assert_eq!(listed_keys.len(), 1);
+	assert_eq!(listed_keys[0], key);
+
+	let mut reader = kv_store.read(namespace, key).unwrap();
+	let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
+	assert_eq!(*data, read_data);
+
+	kv_store.remove(namespace, key).unwrap();
+
+	let listed_keys = kv_store.list(namespace).unwrap();
+	assert_eq!(listed_keys.len(), 0);
+
+	// Test KVStorePersister
+	let prefixed_key = format!("{}/{}", namespace, key);
+	kv_store.persist(&prefixed_key, &data).unwrap();
+	let mut reader = kv_store.read(namespace, key).unwrap();
+	let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
+	assert_eq!(*data, read_data);
+}

src/io/sqlite_store.rs

@@ -169,45 +169,15 @@ impl KVStorePersister for SqliteStore {
 mod tests {
 	use super::*;
 	use crate::test::utils::random_storage_path;
-	use lightning::util::persist::KVStorePersister;
-	use lightning::util::ser::Readable;
 
 	use proptest::prelude::*;
 	proptest! {
 		#[test]
 		fn read_write_remove_list_persist(data in any::<[u8; 32]>()) {
 			let rand_dir = random_storage_path();
-
 			let sqlite_store = SqliteStore::new(rand_dir.into());
-			let namespace = "testspace";
-			let key = "testkey";
-
-			// Test the basic KVStore operations.
-			sqlite_store.write(namespace, key, &data).unwrap();
-
-			// Test empty namespace is allowed, but not empty key.
-			sqlite_store.write("", key, &data).unwrap();
-			assert!(sqlite_store.write(namespace, "", &data).is_err());
-
-			let listed_keys = sqlite_store.list(namespace).unwrap();
-			assert_eq!(listed_keys.len(), 1);
-			assert_eq!(listed_keys[0], key);
-
-			let mut reader = sqlite_store.read(namespace, key).unwrap();
-			let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
-			assert_eq!(data, read_data);
-
-			sqlite_store.remove(namespace, key).unwrap();
-
-			let listed_keys = sqlite_store.list(namespace).unwrap();
-			assert_eq!(listed_keys.len(), 0);
 
-			// Test KVStorePersister
-			let prefixed_key = format!("{}/{}", namespace, key);
-			sqlite_store.persist(&prefixed_key, &data).unwrap();
-			let mut reader = sqlite_store.read(namespace, key).unwrap();
-			let read_data: [u8; 32] = Readable::read(&mut reader).unwrap();
-			assert_eq!(data, read_data);
+			do_read_write_remove_list_persist(&data, &sqlite_store);
 		}
 	}
 }