f Rename KVStore to KVStoreSync

Author: joostjager

src/builder.rs

@@ -170,17 +170,17 @@ pub enum BuildError {
 	InvalidNodeAlias,
 	/// We failed to read data from the [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStore
+	/// [`KVStore`]: lightning::util::persist::KVStoreSync
 	ReadFailed,
 	/// We failed to write data to the [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStore
+	/// [`KVStore`]: lightning::util::persist::KVStoreSync
 	WriteFailed,
 	/// We failed to access the given `storage_dir_path`.
 	StoragePathAccessFailed,
 	/// We failed to setup our [`KVStore`].
 	///
-	/// [`KVStore`]: lightning::util::persist::KVStore
+	/// [`KVStore`]: lightning::util::persist::KVStoreSync
 	KVStoreSetupFailed,
 	/// We failed to setup the onchain wallet.
 	WalletSetupFailed,

src/io/sqlite_store/migrations.rs

@@ -78,7 +78,7 @@ mod tests {
 	use crate::io::sqlite_store::SqliteStore;
 	use crate::io::test_utils::{do_read_write_remove_list_persist, random_storage_path};
 
-	use lightning::util::persist::KVStore;
+	use lightning::util::persist::KVStoreSync;
 
 	use rusqlite::{named_params, Connection};
 

src/io/sqlite_store/mod.rs

@@ -9,7 +9,7 @@
 use crate::io::utils::check_namespace_key_validity;
 
 use lightning::io;
-use lightning::util::persist::KVStore;
+use lightning::util::persist::KVStoreSync;
 
 use lightning_types::string::PrintableString;
 
@@ -130,7 +130,7 @@ impl SqliteStore {
 	}
 }
 
-impl KVStore for SqliteStore {
+impl KVStoreSync for SqliteStore {
 	fn read(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> io::Result<Vec<u8>> {

src/io/test_utils.rs

@@ -9,7 +9,7 @@ use lightning::ln::functional_test_utils::{
 	connect_block, create_announced_chan_between_nodes, create_chanmon_cfgs, create_dummy_block,
 	create_network, create_node_cfgs, create_node_chanmgrs, send_payment,
 };
-use lightning::util::persist::{read_channel_monitors, KVStore, KVSTORE_NAMESPACE_KEY_MAX_LEN};
+use lightning::util::persist::{read_channel_monitors, KVStoreSync, KVSTORE_NAMESPACE_KEY_MAX_LEN};
 
 use lightning::events::ClosureReason;
 use lightning::util::test_utils;
@@ -29,7 +29,7 @@ pub(crate) fn random_storage_path() -> PathBuf {
 	temp_path
 }
 
-pub(crate) fn do_read_write_remove_list_persist<K: KVStore + RefUnwindSafe>(kv_store: &K) {
+pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(kv_store: &K) {
 	let data = [42u8; 32];
 
 	let primary_namespace = "testspace";
@@ -80,7 +80,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStore + RefUnwindSafe>(kv_s
 
 // Integration-test the given KVStore implementation. Test relaying a few payments and check that
 // the persisted data is updated the appropriate number of times.
-pub(crate) fn do_test_store<K: KVStore + Sync>(store_0: &K, store_1: &K) {
+pub(crate) fn do_test_store<K: KVStoreSync + Sync>(store_0: &K, store_1: &K) {
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let mut node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let chain_mon_0 = test_utils::TestChainMonitor::new(

src/io/vss_store.rs

@@ -8,7 +8,7 @@
 use crate::io::utils::check_namespace_key_validity;
 use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
 use lightning::io::{self, Error, ErrorKind};
-use lightning::util::persist::KVStore;
+use lightning::util::persist::KVStoreSync;
 use prost::Message;
 use rand::RngCore;
 #[cfg(test)]
@@ -127,7 +127,7 @@ impl VssStore {
 	}
 }
 
-impl KVStore for VssStore {
+impl KVStoreSync for VssStore {
 	fn read(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> io::Result<Vec<u8>> {

src/types.rs

@@ -25,7 +25,7 @@ use lightning::routing::gossip;
 use lightning::routing::router::DefaultRouter;
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters};
 use lightning::sign::InMemorySigner;
-use lightning::util::persist::KVStore;
+use lightning::util::persist::KVStoreSync;
 use lightning::util::ser::{Readable, Writeable, Writer};
 use lightning::util::sweep::OutputSweeper;
 
@@ -38,7 +38,7 @@ use bitcoin::OutPoint;
 
 use std::sync::{Arc, Mutex};
 
-pub(crate) type DynStore = dyn KVStore + Sync + Send;
+pub(crate) type DynStore = dyn KVStoreSync + Sync + Send;
 
 pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
 	InMemorySigner,

tests/common/mod.rs

@@ -21,7 +21,7 @@ use ldk_node::{
 
 use lightning::ln::msgs::SocketAddress;
 use lightning::routing::gossip::NodeAlias;
-use lightning::util::persist::KVStore;
+use lightning::util::persist::KVStoreSync;
 use lightning::util::test_utils::TestStore;
 
 use lightning_invoice::{Bolt11InvoiceDescription, Description};
@@ -1130,7 +1130,7 @@ impl TestSyncStore {
 	}
 }
 
-impl KVStore for TestSyncStore {
+impl KVStoreSync for TestSyncStore {
 	fn read(
 		&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 	) -> lightning::io::Result<Vec<u8>> {

tests/integration_tests_rust.rs

@@ -26,7 +26,7 @@ use ldk_node::{Builder, Event, NodeError};
 use lightning::ln::channelmanager::PaymentId;
 use lightning::routing::gossip::{NodeAlias, NodeId};
 use lightning::routing::router::RouteParametersConfig;
-use lightning::util::persist::KVStore;
+use lightning::util::persist::KVStoreSync;
 
 use lightning_invoice::{Bolt11InvoiceDescription, Description};
 
@@ -242,7 +242,7 @@ fn start_stop_reinit() {
 
 	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
 
-	let test_sync_store: Arc<dyn KVStore + Sync + Send> =
+	let test_sync_store: Arc<dyn KVStoreSync + Sync + Send> =
 		Arc::new(TestSyncStore::new(config.node_config.storage_dir_path.clone().into()));
 
 	let sync_config = EsploraSyncConfig { background_sync_config: None };