Address comments

Author: G8XSU

src/io/mod.rs

@@ -3,6 +3,7 @@
 pub(crate) mod fs_store;
 pub(crate) mod sqlite_store;
 pub(crate) mod utils;
+pub(crate) mod vss_store;
 
 pub use fs_store::FilesystemStore;
 pub use sqlite_store::SqliteStore;

src/io/vss_store.rs

@@ -3,7 +3,7 @@ use std::io::Read;
 use std::sync::Arc;
 use std::{error::Error, io};
 
-use super::*;
+use crate::io::get_namespace_and_key_from_prefixed;
 use crate::KVStore;
 use lightning::util::persist::KVStorePersister;
 use lightning::util::ser::Writeable;
@@ -14,22 +14,17 @@ use vss_client::types::{
 	DeleteObjectRequest, GetObjectRequest, KeyValue, ListKeyVersionsRequest, PutObjectRequest,
 };
 
-/// Implements [KVStore] and [KVStorePersister] for VSS using [VssClient].
-///
-/// A [`KVStore`] implementation that writes to and reads from VSS using [VssClient].
-///
-/// Learn more about Versioned Storage Service (VSS) [here](https://github.com/lightningdevkit/vss-server/blob/main/README.md).
-pub struct VssKVStore {
+/// A [`KVStore`] implementation that writes to and reads from a [VSS](https://github.com/lightningdevkit/vss-server/blob/main/README.md) backend.
+pub struct VssStore {
 	client: VssClient,
 	store_id: String,
-	runtime: Arc<Runtime>,
+	runtime: Runtime,
 }
 
-impl VssKVStore {
+impl VssStore {
 	pub(crate) fn new(base_url: &str, store_id: String) -> Self {
 		let client = VssClient::new(base_url);
-		let runtime =
-			Arc::new(tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap());
+		let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build().unwrap();
 		Self { client, store_id, runtime }
 	}
 
@@ -71,7 +66,7 @@ impl VssKVStore {
 	}
 }
 
-impl KVStore for VssKVStore {
+impl KVStore for VssStore {
 	type Reader = Cursor<Vec<u8>>;
 
 	fn read(&self, namespace: &str, key: &str) -> io::Result<Self::Reader> {
@@ -148,18 +143,19 @@ impl KVStore for VssKVStore {
 	}
 }
 
-impl KVStorePersister for VssKVStore {
+impl KVStorePersister for VssStore {
 	fn persist<W: Writeable>(&self, prefixed_key: &str, object: &W) -> io::Result<()> {
-		self.write("", &prefixed_key, &object.encode())?;
+		let (namespace, key) = self.split_key(prefixed_key);
+		self.write(&namespace, &key, &object.encode())?;
 		Ok(())
 	}
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use crate::io::do_read_write_remove_list_persist;
 	use crate::test::utils::random_storage_path;
-
 	use proptest::prelude::*;
 	proptest! {
 		#[test]
@@ -168,11 +164,11 @@ mod tests {
 				if vss_base_url.is_ok()
 				{
 						let rand_store_id = random_storage_path();
-						let vss_store = VssKVStore::new(&vss_base_url.unwrap(), rand_store_id);
+						let vss_store = VssStore::new(&vss_base_url.unwrap(), rand_store_id);
 
 						do_read_write_remove_list_persist(&data, &vss_store);
 				}else{
-						eprintln!("** SKIPPING `VssKVStore` test-suite since environment variable `TEST_VSS_BASE_URL` is not set **");
+						eprintln!("** SKIPPING `VssStore` test-suite since environment variable `TEST_VSS_BASE_URL` is not set **");
 				}
 		}
 	}