f Error if file can't be found or is not a file

Author: tnull

lightning-persister/src/fs_store.rs

@@ -259,16 +259,28 @@ impl KVStore for FilesystemStore {
 			let entry = entry?;
 			let p = entry.path();
 
-			if !p.is_file() {
-				continue;
-			}
-
 			if let Some(ext) = p.extension() {
 				if ext == "tmp" {
 					continue;
 				}
 			}
 
+			let metadata = p.metadata()?;
+
+			// We allow the presence of directories in the empty namespace and just skip them.
+			if metadata.is_dir() && namespace == "" {
+				continue;
+			}
+
+			// If we otherwise don't find a file at the given path something went wrong.
+			if !metadata.is_file() {
+				debug_assert!(false, "Failed to list keys of namespace {}: file is not present.",
+					PrintableString(namespace));
+				let msg = format!("Failed to list keys of namespace {}: file is not present.",
+					PrintableString(namespace));
+				return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
+			}
+
 			if let Some(relative_path) = p.strip_prefix(&prefixed_dest).ok()
 				.and_then(|p| p.to_str()) {
 					if relative_path.chars().all(|c| c.is_ascii() && !c.is_control()) {