Let LiquidityManager take a KVStore

We add `KVStore` to `LiquidityManager`, which will be used in the next
commits.

Author: tnull

lightning-background-processor/src/lib.rs

@@ -2242,12 +2242,14 @@ mod tests {
 				Arc::clone(&logger),
 				Arc::clone(&keys_manager),
 			));
+			let kv_store_sync = Arc::new(KVStoreSyncWrapper(Arc::clone(&kv_store)));
 			let liquidity_manager = Arc::new(LiquidityManager::new(
 				Arc::clone(&keys_manager),
 				Arc::clone(&keys_manager),
 				Arc::clone(&manager),
 				None,
 				None,
+				kv_store_sync,
 				None,
 				None,
 			));

lightning-liquidity/src/manager.rs

@@ -45,6 +45,7 @@ use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::ln::wire::CustomMessageReader;
 use lightning::sign::{EntropySource, NodeSigner};
 use lightning::util::logger::Level;
+use lightning::util::persist::KVStore;
 use lightning::util::ser::{LengthLimitedRead, LengthReadable};
 use lightning::util::wakers::Future;
 
@@ -195,6 +196,7 @@ pub struct LiquidityManager<
 	_client_config: Option<LiquidityClientConfig>,
 	best_block: RwLock<Option<BestBlock>>,
 	_chain_source: Option<C>,
+	kv_store: Arc<dyn KVStore + Send + Sync>,
 }
 
 #[cfg(feature = "time")]
@@ -209,7 +211,8 @@ where
 	/// Constructor for the [`LiquidityManager`] using the default system clock
 	pub fn new(
 		entropy_source: ES, node_signer: NS, channel_manager: CM, chain_source: Option<C>,
-		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
+		chain_params: Option<ChainParameters>, kv_store: Arc<dyn KVStore + Send + Sync>,
+		service_config: Option<LiquidityServiceConfig>,
 		client_config: Option<LiquidityClientConfig>,
 	) -> Self {
 		let time_provider = Arc::new(DefaultTimeProvider);
@@ -219,6 +222,7 @@ where
 			channel_manager,
 			chain_source,
 			chain_params,
+			kv_store,
 			service_config,
 			client_config,
 			time_provider,
@@ -248,7 +252,8 @@ where
 	/// [`LiquidityClientConfig`] and [`LiquidityServiceConfig`].
 	pub fn new_with_custom_time_provider(
 		entropy_source: ES, node_signer: NS, channel_manager: CM, chain_source: Option<C>,
-		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
+		chain_params: Option<ChainParameters>, kv_store: Arc<dyn KVStore + Send + Sync>,
+		service_config: Option<LiquidityServiceConfig>,
 		client_config: Option<LiquidityClientConfig>, time_provider: TP,
 	) -> Self {
 		let pending_messages = Arc::new(MessageQueue::new());
@@ -373,6 +378,7 @@ where
 			_client_config: client_config,
 			best_block: RwLock::new(chain_params.map(|chain_params| chain_params.best_block)),
 			_chain_source: chain_source,
+			kv_store,
 		}
 	}
 

lightning-liquidity/tests/common/mod.rs

@@ -6,7 +6,8 @@ use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServ
 use lightning::chain::{BestBlock, Filter};
 use lightning::ln::channelmanager::ChainParameters;
 use lightning::ln::functional_test_utils::{Node, TestChannelManager};
-use lightning::util::test_utils::TestKeysInterface;
+use lightning::util::persist::KVStoreSyncWrapper;
+use lightning::util::test_utils::{TestKeysInterface, TestStore};
 
 use bitcoin::Network;
 
@@ -27,23 +28,27 @@ pub(crate) fn create_service_and_client_nodes<'a, 'b, 'c>(
 		network: Network::Testnet,
 		best_block: BestBlock::from_network(Network::Testnet),
 	};
+	let service_kv_store = Arc::new(KVStoreSyncWrapper(Arc::new(TestStore::new(false))));
 	let service_lm = LiquidityManager::new_with_custom_time_provider(
 		nodes[0].keys_manager,
 		nodes[0].keys_manager,
 		nodes[0].node,
 		None::<Arc<dyn Filter + Send + Sync>>,
 		Some(chain_params.clone()),
+		service_kv_store,
 		Some(service_config),
 		None,
 		Arc::clone(&time_provider),
 	);
 
+	let client_kv_store = Arc::new(KVStoreSyncWrapper(Arc::new(TestStore::new(false))));
 	let client_lm = LiquidityManager::new_with_custom_time_provider(
 		nodes[1].keys_manager,
 		nodes[1].keys_manager,
 		nodes[1].node,
 		None::<Arc<dyn Filter + Send + Sync>>,
 		Some(chain_params),
+		client_kv_store,
 		None,
 		Some(client_config),
 		time_provider,