Rename migratable KV store trait for sync API

Prepare the migration API naming for an async variant by giving the
existing synchronous trait an explicit Sync suffix.

Co-Authored-By: HAL 9000

Author: tnull

lightning-persister/src/fs_store/v1.rs

@@ -1,7 +1,7 @@
 //! Objects related to [`FilesystemStore`] live here.
 use crate::fs_store::common::FilesystemStoreState;
 
-use lightning::util::persist::{KVStoreSync, MigratableKVStore};
+use lightning::util::persist::{KVStoreSync, MigratableKVStoreSync};
 
 use std::path::PathBuf;
 
@@ -88,7 +88,7 @@ impl KVStore for FilesystemStore {
 	}
 }
 
-impl MigratableKVStore for FilesystemStore {
+impl MigratableKVStoreSync for FilesystemStore {
 	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 		self.state.list_all_keys_impl(false)
 	}

lightning-persister/src/fs_store/v2.rs

@@ -4,7 +4,7 @@ use crate::fs_store::common::{
 };
 
 use lightning::util::persist::{
-	KVStoreSync, MigratableKVStore, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
+	KVStoreSync, MigratableKVStoreSync, PageToken, PaginatedKVStoreSync, PaginatedListResponse,
 };
 
 use std::fs;
@@ -315,7 +315,7 @@ impl PaginatedKVStore for FilesystemStoreV2 {
 	}
 }
 
-impl MigratableKVStore for FilesystemStoreV2 {
+impl MigratableKVStoreSync for FilesystemStoreV2 {
 	fn list_all_keys(&self) -> Result<Vec<(String, String, String)>, lightning::io::Error> {
 		self.inner.list_all_keys_impl(true)
 	}

lightning-persister/src/test_utils.rs

@@ -1,7 +1,7 @@
 use lightning::events::ClosureReason;
 use lightning::ln::functional_test_utils::*;
 use lightning::util::persist::{
-	migrate_kv_store_data, read_channel_monitors, KVStoreSync, MigratableKVStore,
+	migrate_kv_store_data, read_channel_monitors, KVStoreSync, MigratableKVStoreSync,
 	KVSTORE_NAMESPACE_KEY_ALPHABET, KVSTORE_NAMESPACE_KEY_MAX_LEN,
 };
 use lightning::util::test_utils;
@@ -59,7 +59,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
 	assert_eq!(listed_keys.len(), 0);
 }
 
-pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>(
+pub(crate) fn do_test_data_migration<S: MigratableKVStoreSync, T: MigratableKVStoreSync>(
 	source_store: &mut S, target_store: &mut T,
 ) {
 	// We fill the source with some bogus keys.

lightning/src/util/persist.rs

@@ -554,9 +554,9 @@ pub trait PaginatedKVStore: KVStore {
 	) -> impl Future<Output = Result<PaginatedListResponse, io::Error>> + 'static + MaybeSend;
 }
 
-/// Provides additional interface methods that are required for [`KVStore`]-to-[`KVStore`]
+/// Provides additional interface methods that are required for [`KVStoreSync`]-to-[`KVStoreSync`]
 /// data migration.
-pub trait MigratableKVStore: KVStoreSync {
+pub trait MigratableKVStoreSync: KVStoreSync {
 	/// Returns *all* known keys as a list of `primary_namespace`, `secondary_namespace`, `key` tuples.
 	///
 	/// This is useful for migrating data from [`KVStoreSync`] implementation to [`KVStoreSync`]
@@ -575,7 +575,7 @@ pub trait MigratableKVStore: KVStoreSync {
 ///
 /// Will abort and return an error if any IO operation fails. Note that in this case the
 /// `target_store` might get left in an intermediate state.
-pub fn migrate_kv_store_data<S: MigratableKVStore, T: MigratableKVStore>(
+pub fn migrate_kv_store_data<S: MigratableKVStoreSync, T: MigratableKVStoreSync>(
 	source_store: &mut S, target_store: &mut T,
 ) -> Result<(), io::Error> {
 	let keys_to_migrate = source_store.list_all_keys()?;