revise tests to use TestStore, though they break now

Author: domZippilli

lightning/src/util/persist.rs

@@ -574,104 +574,28 @@ mod tests {
     use crate::chain::ChannelMonitorUpdateStatus;
     use crate::events::{ClosureReason, MessageSendEventsProvider};
     use crate::ln::functional_test_utils::*;
-    use crate::util::test_utils::{self, TestLogger};
+    use crate::util::test_utils::{self, TestLogger, TestStore};
     use crate::{check_added_monitors, check_closed_broadcast};
-    //use rand::{distributions::Alphanumeric, thread_rng, Rng};
-    use std::{collections::HashMap, io::Cursor, sync::Mutex};
 
     // =================================
     // TEST UTILITIES
     // =================================
 
-    struct HashMapKVStore {
-        storage: Mutex<HashMap<String, Vec<u8>>>,
-        read_only: bool,
-    }
-
-    impl HashMapKVStore {
-        fn new(read_only: bool) -> Self {
-            Self {
-                storage: Mutex::new(HashMap::new()),
-                read_only,
-            }
-        }
-    }
-
-    impl KVStore for HashMapKVStore {
-        type Reader = Cursor<Vec<u8>>;
-
-        fn read(&self, namespace: &str, key: &str) -> io::Result<Self::Reader> {
-            let key = [namespace, key].join("/");
-            let storage = self.storage.lock().unwrap();
-            let value = storage.get(&key);
-            match value {
-                Some(vec) => Ok(Cursor::new(vec.clone())),
-                None => Err(std::io::Error::new(
-                    std::io::ErrorKind::NotFound,
-                    "not found",
-                )),
-            }
-        }
-
-        fn write(&self, namespace: &str, key: &str, buf: &[u8]) -> io::Result<()> {
-            if self.read_only {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::PermissionDenied,
-                    "read only",
-                ));
-            }
-            let key = [namespace, key].join("/");
-            let mut storage = self.storage.lock().unwrap();
-            let value = buf.to_vec();
-            storage.insert(key, value);
-            Ok(())
-        }
-
-        fn remove(&self, namespace: &str, key: &str) -> io::Result<()> {
-            if self.read_only {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::PermissionDenied,
-                    "read only",
-                ));
-            }
-            let key = [namespace, key].join("/");
-            let mut storage = self.storage.lock().unwrap();
-            storage.remove(&key);
-            Ok(())
-        }
-
-        fn list(&self, namespace: &str) -> io::Result<Vec<String>> {
-            let ns = [namespace, "/"].join("");
-            let storage = self.storage.lock().unwrap();
-            Ok(storage
-                .keys()
-                .filter_map(|k| k.starts_with(&ns).then(|| k.replacen(&ns, "", 1)))
-                .collect())
-        }
-    }
-
-    fn default_test_persister() -> KVStoreUpdatingPersister<Box<HashMapKVStore>, Box<TestLogger>> {
+    fn default_test_persister() -> KVStoreUpdatingPersister<Box<TestStore>, Box<TestLogger>> {
         KVStoreUpdatingPersister {
-            kv: Box::new(HashMapKVStore::new(false)),
+            kv: Box::new(TestStore::new(false)),
             logger: Box::new(TestLogger::new()),
         }
     }
 
-    fn read_only_test_persister() -> KVStoreUpdatingPersister<Box<HashMapKVStore>, Box<TestLogger>>
+    fn read_only_test_persister() -> KVStoreUpdatingPersister<Box<TestStore>, Box<TestLogger>>
     {
         KVStoreUpdatingPersister {
-            kv: Box::new(HashMapKVStore::new(true)),
+            kv: Box::new(TestStore::new(false)),
             logger: Box::new(TestLogger::new()),
         }
     }
 
-    #[test]
-    fn test_read_only_persister_actually_is_ro() {
-        let persister = read_only_test_persister();
-        assert!(persister.kv.write("namespace", "key", &[0]).is_err());
-        assert!(persister.kv.remove("namespace", "key",).is_err());
-    }
-
     // =================================
     // TESTS
     // =================================

lightning/src/util/test_utils.rs

@@ -358,6 +358,12 @@ impl KVStore for TestStore {
 	}
 
 	fn write(&self, namespace: &str, key: &str, buf: &[u8]) -> io::Result<()> {
+		if self.read_only {
+			return Err(std::io::Error::new(
+				std::io::ErrorKind::PermissionDenied,
+				"read only",
+			));
+		}
 		if self.read_only {
 			return Err(io::Error::new(
 				io::ErrorKind::PermissionDenied,
@@ -374,6 +380,12 @@ impl KVStore for TestStore {
 	}
 
 	fn remove(&self, namespace: &str, key: &str) -> io::Result<()> {
+		if self.read_only {
+			return Err(std::io::Error::new(
+				std::io::ErrorKind::PermissionDenied,
+				"read only",
+			));
+		}
 		if self.read_only {
 			return Err(io::Error::new(
 				io::ErrorKind::PermissionDenied,