Move test store checks onto async KV storage

Exercise async KVStore operations in TestSyncStore and filesystem
migration tests while keeping the temporary sync comparison path until
the final KVStoreSync removal. Also route pathfinding score export
through async KVStore reads.

Co-Authored-By: HAL 9000

Author: tnull

src/io/utils.rs

@@ -718,7 +718,7 @@ mod tests {
 	use std::fs;
 	use std::path::{Path, PathBuf};
 
-	use lightning::util::persist::{migrate_kv_store_data, KVStoreSync};
+	use lightning::util::persist::{migrate_kv_store_data_async, KVStore};
 	use lightning_persister::fs_store::v1::FilesystemStore;
 	use lightning_persister::fs_store::v2::FilesystemStoreV2;
 
@@ -742,19 +742,20 @@ mod tests {
 	#[tokio::test]
 	async fn fs_store_migration_recovers_before_v1_backup_rename() {
 		let fs_store_path = fs_store_path();
-		let mut v1_store = write_v1_test_data(&fs_store_path);
+		let v1_store = write_v1_test_data(&fs_store_path).await;
 		let v2_migrating_path = sibling_path(&fs_store_path, "fs_store_v2_migrating");
-		let mut v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
-		migrate_kv_store_data(&mut v1_store, &mut v2_store).unwrap();
+		let v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
+		migrate_kv_store_data_async(&v1_store, &v2_store).await.unwrap();
 
 		let migrated_store = open_or_migrate_fs_store(fs_store_path.clone()).await.unwrap();
 		assert_eq!(
-			KVStoreSync::read(
+			KVStore::read(
 				&migrated_store,
 				TEST_PRIMARY_NAMESPACE,
 				TEST_SECONDARY_NAMESPACE,
 				TEST_KEY
 			)
+			.await
 			.unwrap(),
 			TEST_VALUE
 		);
@@ -765,22 +766,23 @@ mod tests {
 	#[tokio::test]
 	async fn fs_store_migration_recovers_after_v1_backup_rename() {
 		let fs_store_path = fs_store_path();
-		let mut v1_store = write_v1_test_data(&fs_store_path);
+		let v1_store = write_v1_test_data(&fs_store_path).await;
 		let v2_migrating_path = sibling_path(&fs_store_path, "fs_store_v2_migrating");
-		let mut v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
-		migrate_kv_store_data(&mut v1_store, &mut v2_store).unwrap();
+		let v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
+		migrate_kv_store_data_async(&v1_store, &v2_store).await.unwrap();
 
 		let backup_path = sibling_path(&fs_store_path, "fs_store_v1_backup");
 		fs::rename(&fs_store_path, backup_path).unwrap();
 
 		let migrated_store = open_or_migrate_fs_store(fs_store_path.clone()).await.unwrap();
 		assert_eq!(
-			KVStoreSync::read(
+			KVStore::read(
 				&migrated_store,
 				TEST_PRIMARY_NAMESPACE,
 				TEST_SECONDARY_NAMESPACE,
 				TEST_KEY
 			)
+			.await
 			.unwrap(),
 			TEST_VALUE
 		);
@@ -791,23 +793,24 @@ mod tests {
 	#[tokio::test]
 	async fn fs_store_migration_recovers_after_v2_rename() {
 		let fs_store_path = fs_store_path();
-		let mut v1_store = write_v1_test_data(&fs_store_path);
+		let v1_store = write_v1_test_data(&fs_store_path).await;
 		let v2_migrating_path = sibling_path(&fs_store_path, "fs_store_v2_migrating");
-		let mut v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
-		migrate_kv_store_data(&mut v1_store, &mut v2_store).unwrap();
+		let v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
+		migrate_kv_store_data_async(&v1_store, &v2_store).await.unwrap();
 
 		let backup_path = sibling_path(&fs_store_path, "fs_store_v1_backup");
 		fs::rename(&fs_store_path, &backup_path).unwrap();
 		fs::rename(&v2_migrating_path, &fs_store_path).unwrap();
 
 		let migrated_store = open_or_migrate_fs_store(fs_store_path.clone()).await.unwrap();
 		assert_eq!(
-			KVStoreSync::read(
+			KVStore::read(
 				&migrated_store,
 				TEST_PRIMARY_NAMESPACE,
 				TEST_SECONDARY_NAMESPACE,
 				TEST_KEY
 			)
+			.await
 			.unwrap(),
 			TEST_VALUE
 		);
@@ -819,19 +822,20 @@ mod tests {
 	#[tokio::test]
 	async fn fs_store_migration_recovers_backup_without_migrating_dir() {
 		let fs_store_path = fs_store_path();
-		write_v1_test_data(&fs_store_path);
+		write_v1_test_data(&fs_store_path).await;
 
 		let backup_path = sibling_path(&fs_store_path, "fs_store_v1_backup");
 		fs::rename(&fs_store_path, backup_path).unwrap();
 
 		let migrated_store = open_or_migrate_fs_store(fs_store_path.clone()).await.unwrap();
 		assert_eq!(
-			KVStoreSync::read(
+			KVStore::read(
 				&migrated_store,
 				TEST_PRIMARY_NAMESPACE,
 				TEST_SECONDARY_NAMESPACE,
 				TEST_KEY
 			)
+			.await
 			.unwrap(),
 			TEST_VALUE
 		);
@@ -844,23 +848,25 @@ mod tests {
 		let fs_store_path = fs_store_path();
 		let v2_migrating_path = sibling_path(&fs_store_path, "fs_store_v2_migrating");
 		let v2_store = FilesystemStoreV2::new(v2_migrating_path.clone()).unwrap();
-		KVStoreSync::write(
+		KVStore::write(
 			&v2_store,
 			TEST_PRIMARY_NAMESPACE,
 			TEST_SECONDARY_NAMESPACE,
 			TEST_KEY,
 			TEST_VALUE.to_vec(),
 		)
+		.await
 		.unwrap();
 
 		let migrated_store = open_or_migrate_fs_store(fs_store_path.clone()).await.unwrap();
 		assert_eq!(
-			KVStoreSync::read(
+			KVStore::read(
 				&migrated_store,
 				TEST_PRIMARY_NAMESPACE,
 				TEST_SECONDARY_NAMESPACE,
 				TEST_KEY
 			)
+			.await
 			.unwrap(),
 			TEST_VALUE
 		);
@@ -880,15 +886,16 @@ mod tests {
 		sibling_path
 	}
 
-	fn write_v1_test_data(fs_store_path: &Path) -> FilesystemStore {
+	async fn write_v1_test_data(fs_store_path: &Path) -> FilesystemStore {
 		let v1_store = FilesystemStore::new(fs_store_path.to_path_buf());
-		KVStoreSync::write(
+		KVStore::write(
 			&v1_store,
 			TEST_PRIMARY_NAMESPACE,
 			TEST_SECONDARY_NAMESPACE,
 			TEST_KEY,
 			TEST_VALUE.to_vec(),
 		)
+		.await
 		.unwrap();
 		v1_store
 	}

src/lib.rs

@@ -155,7 +155,7 @@ use lightning::ln::msgs::{BaseMessageHandler, SocketAddress};
 use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::routing::gossip::NodeAlias;
 use lightning::sign::EntropySource;
-use lightning::util::persist::KVStoreSync;
+use lightning::util::persist::KVStore;
 use lightning::util::wallet_utils::{Input, Wallet as LdkWallet};
 use lightning_background_processor::process_events_async;
 pub use lightning_invoice;
@@ -2062,20 +2062,21 @@ impl Node {
 	/// Exports the current state of the scorer. The result can be shared with and merged by light nodes that only have
 	/// a limited view of the network.
 	pub fn export_pathfinding_scores(&self) -> Result<Vec<u8>, Error> {
-		KVStoreSync::read(
-			&*self.kv_store,
-			lightning::util::persist::SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-			lightning::util::persist::SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-			lightning::util::persist::SCORER_PERSISTENCE_KEY,
-		)
-		.map_err(|e| {
-			log_error!(
-				self.logger,
-				"Failed to access store while exporting pathfinding scores: {}",
-				e
-			);
-			Error::PersistenceFailed
-		})
+		self.runtime
+			.block_on(KVStore::read(
+				&*self.kv_store,
+				lightning::util::persist::SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
+				lightning::util::persist::SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
+				lightning::util::persist::SCORER_PERSISTENCE_KEY,
+			))
+			.map_err(|e| {
+				log_error!(
+					self.logger,
+					"Failed to access store while exporting pathfinding scores: {}",
+					e
+				);
+				Error::PersistenceFailed
+			})
 	}
 
 	/// Return the features used in node announcement.