Merge pull request #4447 from benthecarman/paginated-follow-ups

PaginatedKVStore follow ups

Author: TheBlueMatt

lightning-persister/src/fs_store/common.rs

@@ -9,7 +9,7 @@ use lightning::types::string::PrintableString;
 
 use std::collections::HashMap;
 use std::fs;
-use std::io::{Read, Write};
+use std::io::{ErrorKind, Read, Write};
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
@@ -253,7 +253,11 @@ impl FilesystemStoreInner {
 		version: u64, preserve_mtime: bool,
 	) -> lightning::io::Result<()> {
 		let mtime = if preserve_mtime {
-			fs::metadata(&dest_file_path).ok().and_then(|m| m.modified().ok())
+			match fs::metadata(&dest_file_path) {
+				Err(e) if e.kind() == ErrorKind::NotFound => None,
+				Err(e) => return Err(e.into()),
+				Ok(m) => Some(m.modified()?),
+			}
 		} else {
 			None
 		};

lightning-persister/src/fs_store/v2.rs

@@ -146,15 +146,15 @@ impl FilesystemStoreState {
 		let page_entries: Vec<_> =
 			entries.iter().skip(start_idx).take(PAGE_SIZE).cloned().collect();
 
-		let keys: Vec<String> = page_entries.iter().map(|(_, key)| key.clone()).collect();
-
 		// Determine next page token
 		let next_page_token = if start_idx + PAGE_SIZE < entries.len() {
 			page_entries.last().map(|(mtime, key)| PageToken::new(format_page_token(*mtime, key)))
 		} else {
 			None
 		};
 
+		let keys: Vec<String> = page_entries.into_iter().map(|(_, key)| key).collect();
+
 		Ok(PaginatedListResponse { keys, next_page_token })
 	}
 }