f Improve list error handling

Author: tnull

lightning-persister/src/fs_store.rs

@@ -281,11 +281,27 @@ impl KVStore for FilesystemStore {
 				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()) {
-						keys.push(relative_path.to_string())
+			match p.strip_prefix(&prefixed_dest) {
+				Ok(stripped_path) => {
+					if let Some(relative_path) = stripped_path.to_str() {
+						if relative_path.chars().all(|c| c.is_ascii() && !c.is_control()) {
+							keys.push(relative_path.to_string())
+						}
+					} else {
+						debug_assert!(false, "Failed to list keys of namespace {}: file path is not valid UTF-8",
+							PrintableString(namespace));
+						let msg = format!("Failed to list keys of namespace {}: file path is not valid UTF-8",
+							PrintableString(namespace));
+						return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
 					}
+				}
+				Err(e) => {
+					debug_assert!(false, "Failed to list keys of namespace {}: {}",
+						PrintableString(namespace), e);
+					let msg = format!("Failed to list keys of namespace {}: {}",
+						PrintableString(namespace), e);
+					return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
+				}
 			}
 		}