f Adapt upstream payment store tests

Use the bounded policy when constructing the payment store in wallet
tests. Preserve race tests that count persisted records by inspecting
the payment namespace instead of relying on a complete in-memory cache.

Co-Authored-By: HAL 9000

Author: tnull

src/wallet/mod.rs

@@ -54,9 +54,9 @@ use lightning_invoice::RawBolt11Invoice;
 use persist::KVStoreWalletPersister;
 
 use crate::config::{Config, ADDRESS_POOL_SIZE};
-#[cfg(test)]
-use crate::data_store::KeepAllEntries;
 use crate::data_store::StorableObject;
+#[cfg(test)]
+use crate::data_store::{KeepAllEntries, KeepLeastRecentlyUsed};
 use crate::fee_estimator::{ConfirmationTarget, FeeEstimator, OnchainFeeEstimator};
 use crate::logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
 use crate::payment::pending_payment_store::PendingPaymentDetailsUpdate;
@@ -2626,7 +2626,7 @@ mod tests {
 	use lightning::util::persist::{KVStore, PageToken, PaginatedKVStore, PaginatedListResponse};
 
 	use super::*;
-	use crate::config::EsploraSyncConfig;
+	use crate::config::{EsploraSyncConfig, PAYMENT_CACHE_CAPACITY};
 	use crate::io::test_utils::InMemoryStore;
 	use crate::io::{
 		BDK_WALLET_ADDRESS_POOL_KEY, BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE,
@@ -2752,7 +2752,7 @@ mod tests {
 		.unwrap();
 		let payment_store = Arc::new(PaymentStore::new(
 			Vec::new(),
-			KeepAllEntries,
+			KeepLeastRecentlyUsed::new(PAYMENT_CACHE_CAPACITY),
 			PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE.to_string(),
 			PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE.to_string(),
 			Arc::clone(&store),
@@ -3853,7 +3853,7 @@ mod tests {
 	async fn funding_confirmation_waits_for_classification() {
 		let gated = NamespaceGatedStore::new(PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE);
 		let store: Arc<DynStore> = Arc::new(DynStoreWrapper(gated.clone()));
-		let wallet = new_test_wallet(store, false).await;
+		let wallet = new_test_wallet(Arc::clone(&store), false).await;
 
 		let txid1 = Txid::from_byte_array([1u8; 32]);
 		let txid2 = Txid::from_byte_array([2u8; 32]);
@@ -3898,7 +3898,14 @@ mod tests {
 		// Liveness sanity only (both pre- and post-fix stall here): while classification is
 		// parked, no second record may have been committed.
 		tokio::time::sleep(Duration::from_millis(250)).await;
-		assert!(wallet.payment_store.list_filter(|_| true).await.len() <= 1);
+		let payment_keys = KVStore::list(
+			&*store,
+			PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
+			PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
+		)
+		.await
+		.unwrap();
+		assert!(payment_keys.len() <= 1);
 
 		drop(gate_guard);
 		classification.await.unwrap().unwrap();
@@ -3907,9 +3914,15 @@ mod tests {
 		// Both writers converge on the classified record: the confirmation refreshes it in
 		// place with the confirmed candidate's figures rather than minting a second record
 		// keyed by the event txid.
-		let payments = wallet.payment_store.list_filter(|_| true).await;
-		assert_eq!(payments.len(), 1, "the confirmation must not mint a duplicate record");
-		let payment = &payments[0];
+		let payment_keys = KVStore::list(
+			&*store,
+			PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
+			PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
+		)
+		.await
+		.unwrap();
+		assert_eq!(payment_keys.len(), 1, "the confirmation must not mint a duplicate record");
+		let payment = wallet.payment_store.get(&payment_id).await.unwrap().unwrap();
 		assert_eq!(payment.id, payment_id);
 		assert_eq!(payment.amount_msat, Some(2_000_000));
 		assert_eq!(payment.fee_paid_msat, Some(999));
@@ -3932,7 +3945,7 @@ mod tests {
 	#[tokio::test(flavor = "multi_thread")]
 	async fn funding_classification_waits_for_wallet_sync() {
 		let store: Arc<DynStore> = Arc::new(DynStoreWrapper(InMemoryStore::new()));
-		let wallet = new_test_wallet(store, false).await;
+		let wallet = new_test_wallet(Arc::clone(&store), false).await;
 
 		let txid = Txid::from_byte_array([3u8; 32]);
 		let payment_id = PaymentId(txid.to_byte_array());
@@ -3971,9 +3984,15 @@ mod tests {
 		// Both writers converge on one record carrying the classification: the generic
 		// fallback must not clobber the contribution-derived figures with its wallet-derived
 		// view of the transaction.
-		let payments = wallet.payment_store.list_filter(|_| true).await;
-		assert_eq!(payments.len(), 1);
-		let payment = &payments[0];
+		let payment_keys = KVStore::list(
+			&*store,
+			PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
+			PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
+		)
+		.await
+		.unwrap();
+		assert_eq!(payment_keys.len(), 1);
+		let payment = wallet.payment_store.get(&payment_id).await.unwrap().unwrap();
 		assert_eq!(payment.id, payment_id);
 		assert_eq!(
 			payment.amount_msat,