Remove KVStoreSync from core traits and store implementations

Remove the SyncAndAsyncKVStore supertrait and all KVStoreSync
implementations from SqliteStore, VssStore, and InMemoryStore.
Simplify DynStoreTrait to only contain async methods, renaming
read_async/write_async/remove_async/list_async back to
read/write/remove/list.

Remove the blocking_client field from VssStoreInner since it was
only used by the KVStoreSync impl, and rename async_client to client.

Remove sync test infrastructure (do_test_store, create_persister,
create_chain_monitor) that depended on KVStoreSync. Convert
remaining test helpers and integration test common module to use
async KVStore via block_on.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: joostjager

src/builder.rs

@@ -77,7 +77,7 @@ use crate::tx_broadcaster::TransactionBroadcaster;
 use crate::types::{
 	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
 	GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
-	PendingPaymentStore, SyncAndAsyncKVStore,
+	PendingPaymentStore,
 };
 use crate::wallet::persist::KVStoreWalletPersister;
 use crate::wallet::Wallet;
@@ -169,17 +169,17 @@ pub enum BuildError {
 	RuntimeSetupFailed,
 	/// We failed to read data from the [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStoreSync
+	/// [`KVStore`]: lightning::util::persist::KVStore
 	ReadFailed,
 	/// We failed to write data to the [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStoreSync
+	/// [`KVStore`]: lightning::util::persist::KVStore
 	WriteFailed,
 	/// We failed to access the given `storage_dir_path`.
 	StoragePathAccessFailed,
 	/// We failed to setup our [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStoreSync
+	/// [`KVStore`]: lightning::util::persist::KVStore
 	KVStoreSetupFailed,
 	/// We failed to setup the onchain wallet.
 	WalletSetupFailed,
@@ -655,7 +655,7 @@ impl NodeBuilder {
 	}
 
 	/// Builds a [`Node`] instance according to the options previously configured.
-	pub fn build_with_store<S: SyncAndAsyncKVStore + Send + Sync + 'static>(
+	pub fn build_with_store<S: KVStore + Send + Sync + 'static>(
 		&self, node_entropy: NodeEntropy, kv_store: S,
 	) -> Result<Node, BuildError> {
 		let logger = setup_logger(&self.log_writer_config, &self.config)?;
@@ -1020,7 +1020,7 @@ impl ArcedNodeBuilder {
 	/// Builds a [`Node`] instance according to the options previously configured.
 	// Note that the generics here don't actually work for Uniffi, but we don't currently expose
 	// this so its not needed.
-	pub fn build_with_store<S: SyncAndAsyncKVStore + Send + Sync + 'static>(
+	pub fn build_with_store<S: KVStore + Send + Sync + 'static>(
 		&self, node_entropy: Arc<NodeEntropy>, kv_store: S,
 	) -> Result<Arc<Node>, BuildError> {
 		self.inner.read().unwrap().build_with_store(*node_entropy, kv_store).map(Arc::new)

src/io/sqlite_store/migrations.rs

@@ -76,8 +76,9 @@ pub(super) fn migrate_schema(
 mod tests {
 	use std::fs;
 
-	use lightning::util::persist::KVStoreSync;
+	use lightning::util::persist::KVStore;
 	use rusqlite::{named_params, Connection};
+	use tokio::runtime::Runtime;
 
 	use crate::io::sqlite_store::SqliteStore;
 	use crate::io::test_utils::{do_read_write_remove_list_persist, random_storage_path};
@@ -160,7 +161,10 @@ mod tests {
 
 		// Check we migrate the db just fine without losing our written data.
 		let store = SqliteStore::new(temp_path, Some(db_file_name), Some(kv_table_name)).unwrap();
-		let res = store.read(&test_namespace, "", &test_key).unwrap();
+		let rt = Runtime::new().unwrap();
+		let res = rt
+			.block_on(async { KVStore::read(&store, &test_namespace, "", &test_key).await })
+			.unwrap();
 		assert_eq!(res, test_data);
 
 		// Check we can continue to use the store just fine.

src/io/sqlite_store/mod.rs

@@ -14,7 +14,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 
 use lightning::io;
-use lightning::util::persist::{KVStore, KVStoreSync};
+use lightning::util::persist::KVStore;
 use lightning_types::string::PrintableString;
 use rusqlite::{named_params, Connection};
 
@@ -36,7 +36,7 @@ pub const DEFAULT_KV_TABLE_NAME: &str = "ldk_data";
 // The current SQLite `user_version`, which we can use if we'd ever need to do a schema migration.
 const SCHEMA_USER_VERSION: u16 = 2;
 
-/// A [`KVStoreSync`] implementation that writes to and reads from an [SQLite] database.
+/// A [`KVStore`] implementation that writes to and reads from an [SQLite] database.
 ///
 /// [SQLite]: https://sqlite.org
 pub struct SqliteStore {
@@ -179,49 +179,6 @@ impl KVStore for SqliteStore {
 	}
 }
 
-impl KVStoreSync for SqliteStore {
-	fn read(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
-	) -> io::Result<Vec<u8>> {
-		self.inner.read_internal(primary_namespace, secondary_namespace, key)
-	}
-
-	fn write(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
-	) -> io::Result<()> {
-		let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
-		let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
-		self.inner.write_internal(
-			inner_lock_ref,
-			locking_key,
-			version,
-			primary_namespace,
-			secondary_namespace,
-			key,
-			buf,
-		)
-	}
-
-	fn remove(
-		&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
-	) -> io::Result<()> {
-		let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
-		let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
-		self.inner.remove_internal(
-			inner_lock_ref,
-			locking_key,
-			version,
-			primary_namespace,
-			secondary_namespace,
-			key,
-		)
-	}
-
-	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
-		self.inner.list_internal(primary_namespace, secondary_namespace)
-	}
-}
-
 struct SqliteStoreInner {
 	connection: Arc<Mutex<Connection>>,
 	data_dir: PathBuf,
@@ -516,9 +473,7 @@ impl SqliteStoreInner {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::io::test_utils::{
-		do_read_write_remove_list_persist, do_test_store, random_storage_path,
-	};
+	use crate::io::test_utils::{do_read_write_remove_list_persist, random_storage_path};
 
 	impl Drop for SqliteStore {
 		fn drop(&mut self) {
@@ -541,25 +496,6 @@ mod tests {
 		.unwrap();
 		do_read_write_remove_list_persist(&store);
 	}
-
-	#[test]
-	fn test_sqlite_store() {
-		let mut temp_path = random_storage_path();
-		temp_path.push("test_sqlite_store");
-		let store_0 = SqliteStore::new(
-			temp_path.clone(),
-			Some("test_db_0".to_string()),
-			Some("test_table".to_string()),
-		)
-		.unwrap();
-		let store_1 = SqliteStore::new(
-			temp_path,
-			Some("test_db_1".to_string()),
-			Some("test_table".to_string()),
-		)
-		.unwrap();
-		do_test_store(&store_0, &store_1)
-	}
 }
 
 #[cfg(ldk_bench)]