Drop unnecessary Oks and avoid allocating msgs

Author: tnull

src/io/fs_store.rs

@@ -75,10 +75,13 @@ impl KVStore for FilesystemStore {
 		dest_file_path.push(namespace);
 		dest_file_path.push(key);
 
-		let msg = format!("Could not retrieve parent directory of {}.", dest_file_path.display());
 		let parent_directory = dest_file_path
 			.parent()
-			.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidInput, msg))?
+			.ok_or_else(|| {
+				let msg =
+					format!("Could not retrieve parent directory of {}.", dest_file_path.display());
+				std::io::Error::new(std::io::ErrorKind::InvalidInput, msg)
+			})?
 			.to_path_buf();
 		fs::create_dir_all(parent_directory.clone())?;
 
@@ -151,11 +154,11 @@ impl KVStore for FilesystemStore {
 		fs::remove_file(&dest_file_path)?;
 		#[cfg(not(target_os = "windows"))]
 		{
-			let msg =
-				format!("Could not retrieve parent directory of {}.", dest_file_path.display());
-			let parent_directory = dest_file_path
-				.parent()
-				.ok_or(std::io::Error::new(std::io::ErrorKind::InvalidInput, msg))?;
+			let parent_directory = dest_file_path.parent().ok_or_else(|| {
+				let msg =
+					format!("Could not retrieve parent directory of {}.", dest_file_path.display());
+				std::io::Error::new(std::io::ErrorKind::InvalidInput, msg)
+			})?;
 			let dir_file = fs::OpenOptions::new().read(true).open(parent_directory)?;
 			unsafe {
 				// The above call to `fs::remove_file` corresponds to POSIX `unlink`, whose changes
@@ -245,20 +248,21 @@ impl Read for FilesystemReader {
 
 impl KVStorePersister for FilesystemStore {
 	fn persist<W: Writeable>(&self, prefixed_key: &str, object: &W) -> lightning::io::Result<()> {
-		let msg = format!("Could not persist file for key {}.", prefixed_key);
 		let dest_file_path = PathBuf::from_str(prefixed_key).map_err(|_| {
-			lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg.clone())
+			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(lightning::io::Error::new(
-			lightning::io::ErrorKind::InvalidInput,
-			msg.clone(),
-		))?;
+		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(|_| lightning::io::Error::new(lightning::io::ErrorKind::InvalidInput, msg))?;
+		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())?;

src/io/utils.rs

@@ -100,10 +100,9 @@ where
 {
 	let mut reader =
 		kv_store.read(NETWORK_GRAPH_PERSISTENCE_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY)?;
-	let graph = NetworkGraph::read(&mut reader, logger).map_err(|_| {
+	NetworkGraph::read(&mut reader, logger).map_err(|_| {
 		std::io::Error::new(std::io::ErrorKind::InvalidData, "Failed to deserialize NetworkGraph")
-	})?;
-	Ok(graph)
+	})
 }
 
 /// Read a previously persisted [`Scorer`] from the store.
@@ -116,10 +115,9 @@ where
 	let params = ProbabilisticScoringParameters::default();
 	let mut reader = kv_store.read(SCORER_PERSISTENCE_NAMESPACE, SCORER_PERSISTENCE_KEY)?;
 	let args = (params, network_graph, logger);
-	let scorer = ProbabilisticScorer::read(&mut reader, args).map_err(|_| {
+	ProbabilisticScorer::read(&mut reader, args).map_err(|_| {
 		std::io::Error::new(std::io::ErrorKind::InvalidData, "Failed to deserialize Scorer")
-	})?;
-	Ok(scorer)
+	})
 }
 
 /// Read previously persisted events from the store.
@@ -131,10 +129,9 @@ where
 {
 	let mut reader =
 		kv_store.read(EVENT_QUEUE_PERSISTENCE_NAMESPACE, EVENT_QUEUE_PERSISTENCE_KEY)?;
-	let event_queue = EventQueue::read(&mut reader, (kv_store, logger)).map_err(|_| {
+	EventQueue::read(&mut reader, (kv_store, logger)).map_err(|_| {
 		std::io::Error::new(std::io::ErrorKind::InvalidData, "Failed to deserialize EventQueue")
-	})?;
-	Ok(event_queue)
+	})
 }
 
 /// Read previously persisted peer info from the store.
@@ -145,10 +142,9 @@ where
 	L::Target: Logger,
 {
 	let mut reader = kv_store.read(PEER_INFO_PERSISTENCE_NAMESPACE, PEER_INFO_PERSISTENCE_KEY)?;
-	let peer_info = PeerStore::read(&mut reader, (kv_store, logger)).map_err(|_| {
+	PeerStore::read(&mut reader, (kv_store, logger)).map_err(|_| {
 		std::io::Error::new(std::io::ErrorKind::InvalidData, "Failed to deserialize PeerStore")
-	})?;
-	Ok(peer_info)
+	})
 }
 
 /// Read previously persisted payments information from the store.
@@ -200,8 +196,7 @@ where
 				e
 			);
 			Error::PersistenceFailed
-		})?;
-	Ok(())
+		})
 }
 
 pub(crate) fn read_latest_node_ann_bcast_timestamp<K: KVStore + Sync + Send>(
@@ -239,6 +234,5 @@ where
 				e
 			);
 			Error::PersistenceFailed
-		})?;
-	Ok(())
+		})
 }