Clean up persistence constants

lightning-background-processor/src/lib.rs

@@ -55,11 +55,8 @@ use lightning::sign::EntropySource;
 use lightning::sign::OutputSpender;
 use lightning::util::logger::Logger;
 use lightning::util::persist::{
-	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
-	CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-	NETWORK_GRAPH_PERSISTENCE_KEY, NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE, SCORER_PERSISTENCE_KEY,
-	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
+	KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY, CHANNEL_MANAGER_NAMESPACE,
+	NETWORK_GRAPH_KEY, NETWORK_GRAPH_NAMESPACE, SCORER_KEY, SCORER_NAMESPACE,
 };
 use lightning::util::sweep::OutputSweeper;
 #[cfg(feature = "std")]
@@ -794,14 +791,8 @@ where
 				if let Some(duration_since_epoch) = fetch_time() {
 					if update_scorer(scorer, &event, duration_since_epoch) {
 						log_trace!(logger, "Persisting scorer after update");
-						if let Err(e) = kv_store
-							.write(
-								SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-								SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-								SCORER_PERSISTENCE_KEY,
-								scorer.encode(),
-							)
-							.await
+						if let Err(e) =
+							kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await
 						{
 							log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
 							// We opt not to abort early on persistence failure here as persisting
@@ -932,9 +923,9 @@ where
 			let fut = async {
 				kv_store
 					.write(
-						CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-						CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-						CHANNEL_MANAGER_PERSISTENCE_KEY,
+						CHANNEL_MANAGER_NAMESPACE,
+						"",
+						CHANNEL_MANAGER_KEY,
 						channel_manager.get_cm().encode(),
 					)
 					.await
@@ -995,9 +986,9 @@ where
 				let fut = async {
 					if let Err(e) = kv_store
 						.write(
-							NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-							NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-							NETWORK_GRAPH_PERSISTENCE_KEY,
+							NETWORK_GRAPH_NAMESPACE,
+							"",
+							NETWORK_GRAPH_KEY,
 							network_graph.encode(),
 						)
 						.await
@@ -1035,14 +1026,8 @@ where
 						log_trace!(logger, "Persisting scorer");
 					}
 					let fut = async {
-						if let Err(e) = kv_store
-							.write(
-								SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-								SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-								SCORER_PERSISTENCE_KEY,
-								scorer.encode(),
-							)
-							.await
+						if let Err(e) =
+							kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await
 						{
 							log_error!(
 							logger,
@@ -1142,30 +1127,18 @@ where
 	// ChannelMonitor update(s) persisted without a corresponding ChannelManager update.
 	kv_store
 		.write(
-			CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-			CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-			CHANNEL_MANAGER_PERSISTENCE_KEY,
+			CHANNEL_MANAGER_NAMESPACE,
+			"",
+			CHANNEL_MANAGER_KEY,
 			channel_manager.get_cm().encode(),
 		)
 		.await?;
 	if let Some(ref scorer) = scorer {
-		kv_store
-			.write(
-				SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-				SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-				SCORER_PERSISTENCE_KEY,
-				scorer.encode(),
-			)
-			.await?;
+		kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await?;
 	}
 	if let Some(network_graph) = gossip_sync.network_graph() {
 		kv_store
-			.write(
-				NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-				NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-				NETWORK_GRAPH_PERSISTENCE_KEY,
-				network_graph.encode(),
-			)
+			.write(NETWORK_GRAPH_NAMESPACE, "", NETWORK_GRAPH_KEY, network_graph.encode())
 			.await?;
 	}
 	Ok(())
@@ -1370,12 +1343,9 @@ impl BackgroundProcessor {
 						.expect("Time should be sometime after 1970");
 					if update_scorer(scorer, &event, duration_since_epoch) {
 						log_trace!(logger, "Persisting scorer after update");
-						if let Err(e) = kv_store.write(
-							SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-							SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-							SCORER_PERSISTENCE_KEY,
-							scorer.encode(),
-						) {
+						if let Err(e) =
+							kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())
+						{
 							log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e)
 						}
 					}
@@ -1471,9 +1441,9 @@ impl BackgroundProcessor {
 				if channel_manager.get_cm().get_and_clear_needs_persistence() {
 					log_trace!(logger, "Persisting ChannelManager...");
 					(kv_store.write(
-						CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-						CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-						CHANNEL_MANAGER_PERSISTENCE_KEY,
+						CHANNEL_MANAGER_NAMESPACE,
+						"",
+						CHANNEL_MANAGER_KEY,
 						channel_manager.get_cm().encode(),
 					))?;
 					log_trace!(logger, "Done persisting ChannelManager.");
@@ -1503,9 +1473,9 @@ impl BackgroundProcessor {
 							duration_since_epoch.as_secs(),
 						);
 						if let Err(e) = kv_store.write(
-							NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-							NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-							NETWORK_GRAPH_PERSISTENCE_KEY,
+							NETWORK_GRAPH_NAMESPACE,
+							"",
+							NETWORK_GRAPH_KEY,
 							network_graph.encode(),
 						) {
 							log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}", e);
@@ -1531,12 +1501,9 @@ impl BackgroundProcessor {
 							.expect("Time should be sometime after 1970");
 						log_trace!(logger, "Calling time_passed and persisting scorer");
 						scorer.write_lock().time_passed(duration_since_epoch);
-						if let Err(e) = kv_store.write(
-							SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-							SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-							SCORER_PERSISTENCE_KEY,
-							scorer.encode(),
-						) {
+						if let Err(e) =
+							kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())
+						{
 							log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
 						}
 					}
@@ -1572,24 +1539,19 @@ impl BackgroundProcessor {
 			// some races where users quit while channel updates were in-flight, with
 			// ChannelMonitor update(s) persisted without a corresponding ChannelManager update.
 			kv_store.write(
-				CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-				CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
-				CHANNEL_MANAGER_PERSISTENCE_KEY,
+				CHANNEL_MANAGER_NAMESPACE,
+				"",
+				CHANNEL_MANAGER_KEY,
 				channel_manager.get_cm().encode(),
 			)?;
 			if let Some(ref scorer) = scorer {
-				kv_store.write(
-					SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-					SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-					SCORER_PERSISTENCE_KEY,
-					scorer.encode(),
-				)?;
+				kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())?;
 			}
 			if let Some(network_graph) = gossip_sync.network_graph() {
 				kv_store.write(
-					NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-					NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-					NETWORK_GRAPH_PERSISTENCE_KEY,
+					NETWORK_GRAPH_NAMESPACE,
+					"",
+					NETWORK_GRAPH_KEY,
 					network_graph.encode(),
 				)?;
 			}
@@ -1681,12 +1643,8 @@ mod tests {
 	use lightning::types::payment::PaymentHash;
 	use lightning::util::config::UserConfig;
 	use lightning::util::persist::{
-		KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_PERSISTENCE_KEY,
-		CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-		CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY,
-		NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-		SCORER_PERSISTENCE_KEY, SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-		SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
+		KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY, CHANNEL_MANAGER_NAMESPACE,
+		NETWORK_GRAPH_KEY, NETWORK_GRAPH_NAMESPACE, SCORER_KEY, SCORER_NAMESPACE,
 	};
 	use lightning::util::ser::Writeable;
 	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
@@ -1937,19 +1895,15 @@ mod tests {
 		fn write(
 			&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
 		) -> lightning::io::Result<()> {
-			if primary_namespace == CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE
-				&& secondary_namespace == CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE
-				&& key == CHANNEL_MANAGER_PERSISTENCE_KEY
-			{
+			if primary_namespace == CHANNEL_MANAGER_NAMESPACE && key == CHANNEL_MANAGER_KEY {
+				assert_eq!(secondary_namespace, "");
 				if let Some((error, message)) = self.manager_error {
 					return Err(std::io::Error::new(error, message).into());
 				}
 			}
 
-			if primary_namespace == NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE
-				&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
-				&& key == NETWORK_GRAPH_PERSISTENCE_KEY
-			{
+			if primary_namespace == NETWORK_GRAPH_NAMESPACE && key == NETWORK_GRAPH_KEY {
+				assert_eq!(secondary_namespace, "");
 				if let Some(sender) = &self.graph_persistence_notifier {
 					match sender.send(()) {
 						Ok(()) => {},
@@ -1964,10 +1918,8 @@ mod tests {
 				}
 			}
 
-			if primary_namespace == SCORER_PERSISTENCE_PRIMARY_NAMESPACE
-				&& secondary_namespace == SCORER_PERSISTENCE_SECONDARY_NAMESPACE
-				&& key == SCORER_PERSISTENCE_KEY
-			{
+			if primary_namespace == SCORER_NAMESPACE && key == SCORER_KEY {
+				assert_eq!(secondary_namespace, "");
 				if let Some((error, message)) = self.scorer_error {
 					return Err(std::io::Error::new(error, message).into());
 				}

lightning-block-sync/src/gossip.rs

@@ -10,11 +10,10 @@ use bitcoin::hash_types::BlockHash;
 use bitcoin::transaction::{OutPoint, TxOut};
 
 use lightning::ln::peer_handler::APeerManager;
-
 use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
 use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
-
 use lightning::util::logger::Logger;
+use lightning::util::native_async::FutureSpawner;
 
 use std::collections::VecDeque;
 use std::future::Future;
@@ -43,17 +42,6 @@ pub trait UtxoSource: BlockSource + 'static {
 	fn is_output_unspent<'a>(&'a self, outpoint: OutPoint) -> AsyncBlockSourceResult<'a, bool>;
 }
 
-/// A generic trait which is able to spawn futures in the background.
-///
-/// If the `tokio` feature is enabled, this is implemented on `TokioSpawner` struct which
-/// delegates to `tokio::spawn()`.
-pub trait FutureSpawner: Send + Sync + 'static {
-	/// Spawns the given future as a background task.
-	///
-	/// This method MUST NOT block on the given future immediately.
-	fn spawn<T: Future<Output = ()> + Send + 'static>(&self, future: T);
-}
-
 #[cfg(feature = "tokio")]
 /// A trivial [`FutureSpawner`] which delegates to `tokio::spawn`.
 pub struct TokioSpawner;

lightning-persister/src/test_utils.rs

@@ -5,7 +5,7 @@ use lightning::ln::functional_test_utils::{
 };
 use lightning::util::persist::{
 	migrate_kv_store_data, read_channel_monitors, KVStoreSync, MigratableKVStore,
-	KVSTORE_NAMESPACE_KEY_ALPHABET, KVSTORE_NAMESPACE_KEY_MAX_LEN,
+	NAMESPACE_ALPHABET, NAMESPACE_MAX_LEN,
 };
 use lightning::util::test_utils;
 use lightning::{check_added_monitors, check_closed_broadcast, check_closed_event};
@@ -46,8 +46,8 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
 	assert_eq!(listed_keys.len(), 0);
 
 	// Ensure we have no issue operating with primary_namespace/secondary_namespace/key being
-	// KVSTORE_NAMESPACE_KEY_MAX_LEN
-	let max_chars = "A".repeat(KVSTORE_NAMESPACE_KEY_MAX_LEN);
+	// NAMESPACE_MAX_LEN
+	let max_chars = "A".repeat(NAMESPACE_MAX_LEN);
 	kv_store.write(&max_chars, &max_chars, &max_chars, data.clone()).unwrap();
 
 	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
@@ -76,17 +76,16 @@ pub(crate) fn do_test_data_migration<S: MigratableKVStore, T: MigratableKVStore>
 		let primary_namespace = if i == 0 {
 			String::new()
 		} else {
-			format!("testspace{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(i).unwrap())
+			format!("testspace{}", NAMESPACE_ALPHABET.chars().nth(i).unwrap())
 		};
 		for j in 0..num_secondary_namespaces {
 			let secondary_namespace = if i == 0 || j == 0 {
 				String::new()
 			} else {
-				format!("testsubspace{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(j).unwrap())
+				format!("testsubspace{}", NAMESPACE_ALPHABET.chars().nth(j).unwrap())
 			};
 			for k in 0..num_keys {
-				let key =
-					format!("testkey{}", KVSTORE_NAMESPACE_KEY_ALPHABET.chars().nth(k).unwrap());
+				let key = format!("testkey{}", NAMESPACE_ALPHABET.chars().nth(k).unwrap());
 				source_store
 					.write(&primary_namespace, &secondary_namespace, &key, dummy_data.clone())
 					.unwrap();

lightning-persister/src/utils.rs

@@ -1,9 +1,8 @@
 use lightning::types::string::PrintableString;
-use lightning::util::persist::{KVSTORE_NAMESPACE_KEY_ALPHABET, KVSTORE_NAMESPACE_KEY_MAX_LEN};
+use lightning::util::persist::{NAMESPACE_ALPHABET, NAMESPACE_MAX_LEN};
 
 pub(crate) fn is_valid_kvstore_str(key: &str) -> bool {
-	key.len() <= KVSTORE_NAMESPACE_KEY_MAX_LEN
-		&& key.chars().all(|c| KVSTORE_NAMESPACE_KEY_ALPHABET.contains(c))
+	key.len() <= NAMESPACE_MAX_LEN && key.chars().all(|c| NAMESPACE_ALPHABET.contains(c))
 }
 
 pub(crate) fn check_namespace_key_validity(