return io::error

Author: joostjager

lightning-persister/src/fs_store.rs

@@ -1,7 +1,7 @@
 //! Objects related to [`FilesystemStore`] live here.
 use crate::utils::{check_namespace_key_validity, is_valid_kvstore_str};
 
-use lightning::util::async_poll::AsyncResult;
+use lightning::util::async_poll::{AsyncResult, AsyncResultType};
 use lightning::util::persist::{KVStore, MigratableKVStore};
 use lightning::util::string::PrintableString;
 
@@ -333,7 +333,7 @@ impl KVStore for FilesystemStore {
 
 	fn write_async(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8],
-	) -> AsyncResult<'static, ()> {
+	) -> AsyncResultType<'static, (), lightning::io::Error> {
 		todo!()
 	}
 }

lightning/src/util/async_poll.rs

@@ -99,6 +99,9 @@ pub(crate) fn dummy_waker() -> Waker {
 /// A type alias for a future that returns a result of type T.
 pub type AsyncResult<'a, T> = Pin<Box<dyn Future<Output = Result<T, ()>> + 'a + Send>>;
 
+/// A type alias for a future that returns a result of type T with error type V.
+pub type AsyncResultType<'a, T, V> = Pin<Box<dyn Future<Output = Result<T, V>> + 'a + Send>>;
+
 /// A type alias for a future that returns a result of type T.
 pub trait FutureSpawner: Send + Sync + 'static {
 	/// Spawns a future on a runtime.

lightning/src/util/persist.rs

@@ -32,7 +32,7 @@ use crate::sync::Arc;
 use crate::util::logger::Logger;
 use crate::util::ser::{Readable, ReadableArgs, Writeable};
 
-use super::async_poll::AsyncResult;
+use super::async_poll::{AsyncResult, AsyncResultType};
 
 /// The alphabet of characters allowed for namespaces and keys.
 pub const KVSTORE_NAMESPACE_KEY_ALPHABET: &str =
@@ -143,7 +143,7 @@ pub trait KVStore {
 	/// Asynchronously persists the given data under the given `key`.
 	fn write_async(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: &[u8],
-	) -> AsyncResult<'static, ()>;
+	) -> AsyncResultType<'static, (), io::Error>;
 	/// Removes any data that had previously been persisted under the given `key`.
 	///
 	/// If the `lazy` flag is set to `true`, the backend implementation might choose to lazily
@@ -284,6 +284,7 @@ impl<ChannelSigner: EcdsaChannelSigner, K: KVStore + ?Sized + Sync + Send + 'sta
 					&encoded,
 				)
 				.await
+				.map_err(|_| ())
 		})
 	}
 
@@ -303,6 +304,7 @@ impl<ChannelSigner: EcdsaChannelSigner, K: KVStore + ?Sized + Sync + Send + 'sta
 					&encoded,
 				)
 				.await
+				.map_err(|_| ())
 		})
 	}
 
@@ -843,6 +845,7 @@ where
 				&monitor_bytes,
 			)
 			.await
+			.map_err(|_| ())
 	}
 
 	/// Persists a channel update, writing only the update to the parameterized [`KVStore`] if possible.
@@ -873,6 +876,7 @@ where
 						&update,
 					)
 					.await
+					.map_err(|_| ())
 			} else {
 				// In case of channel-close monitor update, we need to read old monitor before persisting
 				// the new one in order to determine the cleanup range.