Split TestStore in TestStore and TestStoreInner

.. where the former holds a reference to the latter, allowing to use the
latter in `async move` contexts more easily.

Author: tnull

lightning/src/util/test_utils.rs

@@ -854,12 +854,47 @@ impl<Signer: sign::ecdsa::EcdsaChannelSigner> Persist<Signer> for TestPersister
 }
 
 pub struct TestStore {
-	persisted_bytes: Mutex<HashMap<String, HashMap<String, Vec<u8>>>>,
-	read_only: bool,
+	inner: Arc<TestStoreInner>,
 }
 
 impl TestStore {
 	pub fn new(read_only: bool) -> Self {
+		let inner = Arc::new(TestStoreInner::new(read_only));
+		Self { inner }
+	}
+}
+
+impl KVStoreSync for TestStore {
+	fn read(
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
+	) -> io::Result<Vec<u8>> {
+		self.inner.read_internal(primary_namespace, secondary_namespace, key)
+	}
+
+	fn write(
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
+	) -> io::Result<()> {
+		self.inner.write_internal(primary_namespace, secondary_namespace, key, buf)
+	}
+
+	fn remove(
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
+	) -> io::Result<()> {
+		self.inner.remove_internal(primary_namespace, secondary_namespace, key, lazy)
+	}
+
+	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
+		self.inner.list_internal(primary_namespace, secondary_namespace)
+	}
+}
+
+struct TestStoreInner {
+	persisted_bytes: Mutex<HashMap<String, HashMap<String, Vec<u8>>>>,
+	read_only: bool,
+}
+
+impl TestStoreInner {
+	fn new(read_only: bool) -> Self {
 		let persisted_bytes = Mutex::new(new_hash_map());
 		Self { persisted_bytes, read_only }
 	}
@@ -950,30 +985,6 @@ impl TestStore {
 	}
 }
 
-impl KVStoreSync for TestStore {
-	fn read(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
-	) -> io::Result<Vec<u8>> {
-		self.read_internal(primary_namespace, secondary_namespace, key)
-	}
-
-	fn write(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
-	) -> io::Result<()> {
-		self.write_internal(primary_namespace, secondary_namespace, key, buf)
-	}
-
-	fn remove(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
-	) -> io::Result<()> {
-		self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
-	}
-
-	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
-		self.list_internal(primary_namespace, secondary_namespace)
-	}
-}
-
 unsafe impl Sync for TestStore {}
 unsafe impl Send for TestStore {}