f Account for sub-namespaces

Author: tnull

lightning/src/util/test_utils.rs

@@ -439,9 +439,15 @@ impl TestStore {
 }
 
 impl KVStore for TestStore {
-	fn read(&self, namespace: &str, key: &str) -> io::Result<Vec<u8>> {
+	fn read(&self, namespace: &str, sub_namespace: &str, key: &str) -> io::Result<Vec<u8>> {
 		let persisted_lock = self.persisted_bytes.lock().unwrap();
-		if let Some(outer_ref) = persisted_lock.get(namespace) {
+		let prefixed = if sub_namespace.is_empty() {
+			namespace.to_string()
+		} else {
+			format!("{}/{}", namespace, sub_namespace)
+		};
+
+		if let Some(outer_ref) = persisted_lock.get(&prefixed) {
 			if let Some(inner_ref) = outer_ref.get(key) {
 				let bytes = inner_ref.clone();
 				Ok(bytes)
@@ -453,22 +459,28 @@ impl KVStore for TestStore {
 		}
 	}
 
-	fn write(&self, namespace: &str, key: &str, buf: &[u8]) -> io::Result<()> {
+	fn write(&self, namespace: &str, sub_namespace: &str, key: &str, buf: &[u8]) -> io::Result<()> {
 		if self.read_only {
 			return Err(io::Error::new(
 				io::ErrorKind::PermissionDenied,
 				"Cannot modify read-only store",
 			));
 		}
 		let mut persisted_lock = self.persisted_bytes.lock().unwrap();
-		let outer_e = persisted_lock.entry(namespace.to_string()).or_insert(HashMap::new());
+
+		let prefixed = if sub_namespace.is_empty() {
+			namespace.to_string()
+		} else {
+			format!("{}/{}", namespace, sub_namespace)
+		};
+		let outer_e = persisted_lock.entry(prefixed).or_insert(HashMap::new());
 		let mut bytes = Vec::new();
 		bytes.write_all(buf)?;
 		outer_e.insert(key.to_string(), bytes);
 		Ok(())
 	}
 
-	fn remove(&self, namespace: &str, key: &str) -> io::Result<()> {
+	fn remove(&self, namespace: &str, sub_namespace: &str, key: &str) -> io::Result<()> {
 		if self.read_only {
 			return Err(io::Error::new(
 				io::ErrorKind::PermissionDenied,
@@ -477,16 +489,28 @@ impl KVStore for TestStore {
 		}
 
 		let mut persisted_lock = self.persisted_bytes.lock().unwrap();
-		if let Some(outer_ref) = persisted_lock.get_mut(namespace) {
+
+		let prefixed = if sub_namespace.is_empty() {
+			namespace.to_string()
+		} else {
+			format!("{}/{}", namespace, sub_namespace)
+		};
+		if let Some(outer_ref) = persisted_lock.get_mut(&prefixed) {
 				outer_ref.remove(&key.to_string());
 		}
 
 		Ok(())
 	}
 
-	fn list(&self, namespace: &str) -> io::Result<Vec<String>> {
+	fn list(&self, namespace: &str, sub_namespace: &str) -> io::Result<Vec<String>> {
 		let mut persisted_lock = self.persisted_bytes.lock().unwrap();
-		match persisted_lock.entry(namespace.to_string()) {
+
+		let prefixed = if sub_namespace.is_empty() {
+			namespace.to_string()
+		} else {
+			format!("{}/{}", namespace, sub_namespace)
+		};
+		match persisted_lock.entry(prefixed) {
 			hash_map::Entry::Occupied(e) => Ok(e.get().keys().cloned().collect()),
 			hash_map::Entry::Vacant(_) => Ok(Vec::new()),
 		}