f Account for KVStore::write taking buf by value

Author: tnull

src/data_store.rs

@@ -143,18 +143,18 @@ where
 		let store_key = object.id().encode_to_hex_str();
 		let data = object.encode();
 		self.kv_store
-			.write(&self.primary_namespace, &self.secondary_namespace, &store_key, &data)
+			.write(&self.primary_namespace, &self.secondary_namespace, &store_key, data)
 			.map_err(|e| {
-				log_error!(
-					self.logger,
-					"Write for key {}/{}/{} failed due to: {}",
-					&self.primary_namespace,
-					&self.secondary_namespace,
-					store_key,
-					e
-				);
-				Error::PersistenceFailed
-			})?;
+			log_error!(
+				self.logger,
+				"Write for key {}/{}/{} failed due to: {}",
+				&self.primary_namespace,
+				&self.secondary_namespace,
+				store_key,
+				e
+			);
+			Error::PersistenceFailed
+		})?;
 		Ok(())
 	}
 }

src/event.rs

@@ -360,7 +360,7 @@ where
 				EVENT_QUEUE_PERSISTENCE_PRIMARY_NAMESPACE,
 				EVENT_QUEUE_PERSISTENCE_SECONDARY_NAMESPACE,
 				EVENT_QUEUE_PERSISTENCE_KEY,
-				&data,
+				data,
 			)
 			.map_err(|e| {
 				log_error!(

src/io/sqlite_store/mod.rs

@@ -180,7 +180,7 @@ impl KVStoreSync for SqliteStore {
 	}
 
 	fn write(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8],
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
 	) -> io::Result<()> {
 		check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "write")?;
 

src/io/test_utils.rs

@@ -30,22 +30,23 @@ pub(crate) fn random_storage_path() -> PathBuf {
 }
 
 pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(kv_store: &K) {
-	let data = [42u8; 32];
+	let data = vec![42u8; 32];
 
 	let primary_namespace = "testspace";
 	let secondary_namespace = "testsubspace";
 	let key = "testkey";
 
 	// Test the basic KVStore operations.
-	kv_store.write(primary_namespace, secondary_namespace, key, &data).unwrap();
+	kv_store.write(primary_namespace, secondary_namespace, key, data.clone()).unwrap();
 
 	// Test empty primary/secondary namespaces are allowed, but not empty primary namespace and non-empty
 	// secondary primary_namespace, and not empty key.
-	kv_store.write("", "", key, &data).unwrap();
-	let res = std::panic::catch_unwind(|| kv_store.write("", secondary_namespace, key, &data));
+	kv_store.write("", "", key, data.clone()).unwrap();
+	let res =
+		std::panic::catch_unwind(|| kv_store.write("", secondary_namespace, key, data.clone()));
 	assert!(res.is_err());
 	let res = std::panic::catch_unwind(|| {
-		kv_store.write(primary_namespace, secondary_namespace, "", &data)
+		kv_store.write(primary_namespace, secondary_namespace, "", data.clone())
 	});
 	assert!(res.is_err());
 
@@ -63,7 +64,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
 
 	// Ensure we have no issue operating with primary_namespace/secondary_namespace/key being KVSTORE_NAMESPACE_KEY_MAX_LEN
 	let max_chars: String = std::iter::repeat('A').take(KVSTORE_NAMESPACE_KEY_MAX_LEN).collect();
-	kv_store.write(&max_chars, &max_chars, &max_chars, &data).unwrap();
+	kv_store.write(&max_chars, &max_chars, &max_chars, data.clone()).unwrap();
 
 	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
 	assert_eq!(listed_keys.len(), 1);

src/io/utils.rs

@@ -287,7 +287,7 @@ where
 			NODE_METRICS_PRIMARY_NAMESPACE,
 			NODE_METRICS_SECONDARY_NAMESPACE,
 			NODE_METRICS_KEY,
-			&data,
+			data,
 		)
 		.map_err(|e| {
 			log_error!(
@@ -442,7 +442,7 @@ macro_rules! impl_read_write_change_set_type {
 			L::Target: LdkLogger,
 		{
 			let data = ChangeSetSerWrapper(value).encode();
-			kv_store.write($primary_namespace, $secondary_namespace, $key, &data).map_err(|e| {
+			kv_store.write($primary_namespace, $secondary_namespace, $key, data).map_err(|e| {
 				log_error!(
 					logger,
 					"Writing data to key {}/{}/{} failed due to: {}",

src/io/vss_store.rs

@@ -160,11 +160,11 @@ impl KVStoreSync for VssStore {
 	}
 
 	fn write(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8],
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
 	) -> io::Result<()> {
 		check_namespace_key_validity(primary_namespace, secondary_namespace, Some(key), "write")?;
 		let version = -1;
-		let storable = self.storable_builder.build(buf.to_vec(), version);
+		let storable = self.storable_builder.build(buf, version);
 		let request = PutObjectRequest {
 			store_id: self.store_id.clone(),
 			global_version: None,

src/peer_store.rs

@@ -73,7 +73,7 @@ where
 				PEER_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 				PEER_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 				PEER_INFO_PERSISTENCE_KEY,
-				&data,
+				data,
 			)
 			.map_err(|e| {
 				log_error!(

tests/common/mod.rs

@@ -1263,12 +1263,14 @@ impl KVStoreSync for TestSyncStore {
 	}
 
 	fn write(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8],
+		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
 	) -> lightning::io::Result<()> {
 		let _guard = self.serializer.write().unwrap();
-		let fs_res = self.fs_store.write(primary_namespace, secondary_namespace, key, buf);
-		let sqlite_res = self.sqlite_store.write(primary_namespace, secondary_namespace, key, buf);
-		let test_res = self.test_store.write(primary_namespace, secondary_namespace, key, buf);
+		let fs_res = self.fs_store.write(primary_namespace, secondary_namespace, key, buf.clone());
+		let sqlite_res =
+			self.sqlite_store.write(primary_namespace, secondary_namespace, key, buf.clone());
+		let test_res =
+			self.test_store.write(primary_namespace, secondary_namespace, key, buf.clone());
 
 		assert!(self
 			.do_list(primary_namespace, secondary_namespace)