Let KVStore::remove not return a bool

Previously, `KVStore::remove` would return a `bool` indicating whether
the deleted data item was present. However, depending on the backend
this might require additional calls to be made. Here we therefore drop
the return value, as we don't use it anyways currently.

Author: tnull

bindings/ldk_node.udl

@@ -81,7 +81,7 @@ interface LDKNode {
 	Invoice receive_variable_amount_payment([ByRef]string description, u32 expiry_secs);
 	PaymentDetails? payment([ByRef]PaymentHash payment_hash);
 	[Throws=NodeError]
-	boolean remove_payment([ByRef]PaymentHash payment_hash);
+	void remove_payment([ByRef]PaymentHash payment_hash);
 	sequence<PaymentDetails> list_payments();
 	sequence<PeerDetails> list_peers();
 	sequence<ChannelDetails> list_channels();

src/io/fs_store.rs

@@ -136,7 +136,7 @@ impl KVStore for FilesystemStore {
 		Ok(())
 	}
 
-	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool> {
+	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<()> {
 		let mut outer_lock = self.locks.lock().unwrap();
 		let lock_key = (namespace.to_string(), key.to_string());
 		let inner_lock_ref = Arc::clone(&outer_lock.entry(lock_key.clone()).or_default());
@@ -148,7 +148,7 @@ impl KVStore for FilesystemStore {
 		dest_file_path.push(key);
 
 		if !dest_file_path.is_file() {
-			return Ok(false);
+			return Ok(());
 		}
 
 		fs::remove_file(&dest_file_path)?;
@@ -190,7 +190,7 @@ impl KVStore for FilesystemStore {
 		// Garbage collect all lock entries that are not referenced anymore.
 		outer_lock.retain(|_, v| Arc::strong_count(&v) > 1);
 
-		Ok(true)
+		Ok(())
 	}
 
 	fn list(&self, namespace: &str) -> std::io::Result<Vec<String>> {

src/io/mod.rs

@@ -69,9 +69,7 @@ pub trait KVStore: KVStorePersister {
 	/// Will create the given `namespace` if not already present in the store.
 	fn write(&self, namespace: &str, key: &str, buf: &[u8]) -> std::io::Result<()>;
 	/// Removes any data that had previously been persisted under the given `key`.
-	///
-	/// Returns `true` if the `key` was present in the given `namespace`, and `false` otherwise.
-	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool>;
+	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<()>;
 	/// Returns a list of keys that are stored under the given `namespace`.
 	///
 	/// Will return an empty list if the `namespace` is unknown.

src/io/sqlite_store.rs

@@ -116,11 +116,11 @@ impl KVStore for SqliteStore {
 			})
 	}
 
-	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool> {
+	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<()> {
 		let locked_conn = self.connection.lock().unwrap();
 
 		let sql = format!("DELETE FROM {} WHERE namespace=:namespace AND key=:key;", KV_TABLE_NAME);
-		let changes = locked_conn
+		locked_conn
 			.execute(
 				&sql,
 				named_params! {
@@ -132,10 +132,7 @@ impl KVStore for SqliteStore {
 				let msg = format!("Failed to delete key {}/{}: {}", namespace, key, e);
 				std::io::Error::new(std::io::ErrorKind::Other, msg)
 			})?;
-
-		let was_present = changes != 0;
-
-		Ok(was_present)
+		Ok(())
 	}
 
 	fn list(&self, namespace: &str) -> std::io::Result<Vec<String>> {

src/lib.rs

@@ -1445,9 +1445,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 	}
 
 	/// Remove the payment with the given hash from the store.
-	///
-	/// Returns `true` if the payment was present and `false` otherwise.
-	pub fn remove_payment(&self, payment_hash: &PaymentHash) -> Result<bool, Error> {
+	pub fn remove_payment(&self, payment_hash: &PaymentHash) -> Result<(), Error> {
 		self.payment_store.remove(&payment_hash)
 	}
 

src/payment_store.rs

@@ -121,7 +121,7 @@ where
 		Ok(updated)
 	}
 
-	pub(crate) fn remove(&self, hash: &PaymentHash) -> Result<bool, Error> {
+	pub(crate) fn remove(&self, hash: &PaymentHash) -> Result<(), Error> {
 		let store_key = hex_utils::to_string(&hash.0);
 		self.kv_store.remove(PAYMENT_INFO_PERSISTENCE_NAMESPACE, &store_key).map_err(|e| {
 			log_error!(

src/test/utils.rs

@@ -96,13 +96,14 @@ impl KVStore for TestStore {
 		Ok(())
 	}
 
-	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool> {
+	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<()> {
 		match self.persisted_bytes.write().unwrap().entry(namespace.to_string()) {
 			hash_map::Entry::Occupied(mut e) => {
 				self.did_persist.store(true, Ordering::SeqCst);
-				Ok(e.get_mut().remove(&key.to_string()).is_some())
+				e.get_mut().remove(&key.to_string());
+				Ok(())
 			}
-			hash_map::Entry::Vacant(_) => Ok(false),
+			hash_map::Entry::Vacant(_) => Ok(()),
 		}
 	}