f DRY up persist

Author: tnull

src/io/fs_store.rs

@@ -1,13 +1,12 @@
 #[cfg(target_os = "windows")]
 extern crate winapi;
 
-use super::KVStore;
+use super::{get_namespace_and_key_from_prefixed, KVStore};
 
 use std::collections::HashMap;
 use std::fs;
 use std::io::{BufReader, Read, Write};
 use std::path::{Path, PathBuf};
-use std::str::FromStr;
 use std::sync::{Arc, Mutex, RwLock};
 
 #[cfg(not(target_os = "windows"))]
@@ -249,25 +248,8 @@ impl Read for FilesystemReader {
 
 impl KVStorePersister for FilesystemStore {
 	fn persist<W: Writeable>(&self, prefixed_key: &str, object: &W) -> lightning::io::Result<()> {
-		let dest_file_path = PathBuf::from_str(prefixed_key).map_err(|_| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-
-		let parent_directory = dest_file_path.parent().ok_or_else(|| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-		let namespace = parent_directory.display().to_string();
-
-		let dest_without_namespace = dest_file_path.strip_prefix(&namespace).map_err(|_| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-		let key = dest_without_namespace.display().to_string();
-
-		self.write(&namespace, &key, &object.encode())?;
-		Ok(())
+		let (namespace, key) = get_namespace_and_key_from_prefixed(prefixed_key)?;
+		self.write(&namespace, &key, &object.encode())
 	}
 }
 

src/io/mod.rs

@@ -10,6 +10,8 @@ pub use sqlite_store::SqliteStore;
 use lightning::util::persist::KVStorePersister;
 
 use std::io::Read;
+use std::path::PathBuf;
+use std::str::FromStr;
 
 // The namespacs and keys LDK uses for persisting
 pub(crate) const CHANNEL_MANAGER_PERSISTENCE_NAMESPACE: &str = "";
@@ -74,3 +76,26 @@ pub trait KVStore: KVStorePersister {
 	/// Will return an empty list if the `namespace` is unknown.
 	fn list(&self, namespace: &str) -> std::io::Result<Vec<String>>;
 }
+
+fn get_namespace_and_key_from_prefixed(
+	prefixed_key: &str,
+) -> lightning::io::Result<(String, String)> {
+	let dest_file_path = PathBuf::from_str(prefixed_key).map_err(|_| {
+		let msg = format!("Could not persist file for key {}.", prefixed_key);
+		lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
+	})?;
+
+	let parent_directory = dest_file_path.parent().ok_or_else(|| {
+		let msg = format!("Could not persist file for key {}.", prefixed_key);
+		lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
+	})?;
+	let namespace = parent_directory.display().to_string();
+
+	let dest_without_namespace = dest_file_path.strip_prefix(&namespace).map_err(|_| {
+		let msg = format!("Could not persist file for key {}.", prefixed_key);
+		lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
+	})?;
+	let key = dest_without_namespace.display().to_string();
+
+	Ok((namespace, key))
+}

src/io/sqlite_store.rs

@@ -8,7 +8,6 @@ use rusqlite::{named_params, Connection};
 use std::fs;
 use std::io::Cursor;
 use std::path::PathBuf;
-use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
 // The database file name.
@@ -161,23 +160,7 @@ impl KVStore for SqliteStore {
 
 impl KVStorePersister for SqliteStore {
 	fn persist<W: Writeable>(&self, prefixed_key: &str, object: &W) -> lightning::io::Result<()> {
-		let dest_file_path = PathBuf::from_str(prefixed_key).map_err(|_| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-
-		let parent_directory = dest_file_path.parent().ok_or_else(|| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-		let namespace = parent_directory.display().to_string();
-
-		let dest_without_namespace = dest_file_path.strip_prefix(&namespace).map_err(|_| {
-			let msg = format!("Could not persist file for key {}.", prefixed_key);
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg)
-		})?;
-		let key = dest_without_namespace.display().to_string();
-
+		let (namespace, key) = get_namespace_and_key_from_prefixed(prefixed_key)?;
 		self.write(&namespace, &key, &object.encode())
 	}
 }