f Use associated type rather than dyn

Author: tnull

src/event.rs

@@ -3,7 +3,9 @@ use crate::{
 	PaymentInfo, PaymentInfoStorage, PaymentStatus, Wallet,
 };
 
-use crate::io::{KVStore, EVENT_QUEUE_PERSISTENCE_KEY, EVENT_QUEUE_PERSISTENCE_NAMESPACE};
+use crate::io::{
+	KVStore, TransactionalWrite, EVENT_QUEUE_PERSISTENCE_KEY, EVENT_QUEUE_PERSISTENCE_NAMESPACE,
+};
 use crate::logger::{log_error, log_info, Logger};
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};

src/io/fs_store.rs

@@ -47,18 +47,21 @@ impl FilesystemStore {
 }
 
 impl KVStore for FilesystemStore {
-	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn Read>> {
+	type Reader = FilesystemReader;
+	type Writer = FilesystemWriter;
+
+	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Self::Reader> {
 		let mut dest_file = self.dest_dir.clone();
 		dest_file.push(namespace);
 		dest_file.push(key);
-		FilesystemReader::new(dest_file).map(|r| Box::new(r) as Box<dyn Read>)
+		FilesystemReader::new(dest_file)
 	}
 
-	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn TransactionalWrite>> {
+	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Self::Writer> {
 		let mut dest_file = self.dest_dir.clone();
 		dest_file.push(namespace);
 		dest_file.push(key);
-		FilesystemWriter::new(dest_file).map(|w| Box::new(w) as Box<dyn TransactionalWrite>)
+		FilesystemWriter::new(dest_file)
 	}
 
 	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool> {

src/io/mod.rs

@@ -36,13 +36,15 @@ pub(crate) const PAYMENT_INFO_PERSISTENCE_NAMESPACE: &str = "payments";
 /// Keys and namespaces are required to be valid ASCII strings and the empty namespace (`""`) is
 /// assumed to be valid namespace.
 pub trait KVStore {
+	type Reader: Read;
+	type Writer: TransactionalWrite;
 	/// Returns a [`Read`] for the given `namespace` and `key` from which [`Readable`]s may be
 	/// read.
 	///
 	/// Returns an `Err` if the given `key` could not be found in the given `namespace`.
 	///
 	/// [`Readable`]: lightning::util::ser::Readable
-	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn Read>>;
+	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Self::Reader>;
 	/// Returns a [`TransactionalWrite`] for the given `key` to which [`Writeable`]s may be written.
 	///
 	/// Will create the given `namespace` if not already present in the store.
@@ -51,7 +53,7 @@ pub trait KVStore {
 	/// the changes won't be persisted.
 	///
 	/// [`Writeable`]: lightning::util::ser::Writeable
-	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn TransactionalWrite>>;
+	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Self::Writer>;
 	/// 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.

src/payment_store.rs

@@ -1,5 +1,5 @@
 use crate::hex_utils;
-use crate::io::{KVStore, PAYMENT_INFO_PERSISTENCE_NAMESPACE};
+use crate::io::{KVStore, TransactionalWrite, PAYMENT_INFO_PERSISTENCE_NAMESPACE};
 use crate::Error;
 
 use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};

src/peer_store.rs

@@ -1,5 +1,5 @@
 use crate::hex_utils;
-use crate::io::{KVStore, PEER_INFO_PERSISTENCE_KEY, PEER_INFO_PERSISTENCE_NAMESPACE};
+use crate::io::{KVStore, TransactionalWrite, PEER_INFO_PERSISTENCE_KEY, PEER_INFO_PERSISTENCE_NAMESPACE};
 use crate::Error;
 
 use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};

src/test/utils.rs

@@ -66,10 +66,13 @@ impl TestStore {
 }
 
 impl KVStore for TestStore {
-	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn Read>> {
+	type Reader = TestReader;
+	type Writer = TestWriter;
+
+	fn read(&self, namespace: &str, key: &str) -> std::io::Result<Self::Reader> {
 		if let Some(outer_ref) = self.persisted_bytes.read().unwrap().get(namespace) {
 			if let Some(inner_ref) = outer_ref.get(key) {
-				Ok(Box::new(TestReader::new(Arc::clone(inner_ref))) as Box<dyn Read>)
+				Ok(TestReader::new(Arc::clone(inner_ref)))
 			} else {
 				let msg = format!("Key not found: {}", key);
 				Err(std::io::Error::new(std::io::ErrorKind::NotFound, msg))
@@ -80,11 +83,11 @@ impl KVStore for TestStore {
 		}
 	}
 
-	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Box<dyn TransactionalWrite>> {
+	fn write(&self, namespace: &str, key: &str) -> std::io::Result<Self::Writer> {
 		let mut guard = self.persisted_bytes.write().unwrap();
 		let outer_e = guard.entry(namespace.to_string()).or_insert(HashMap::new());
 		let inner_e = outer_e.entry(key.to_string()).or_insert(Arc::new(RwLock::new(Vec::new())));
-		Ok(Box::new(TestWriter::new(Arc::clone(&inner_e), Arc::clone(&self.did_persist))))
+		Ok(TestWriter::new(Arc::clone(&inner_e), Arc::clone(&self.did_persist)))
 	}
 
 	fn remove(&self, namespace: &str, key: &str) -> std::io::Result<bool> {