Only prune on peer_{dis}connected

Previously, we'd constantly check whether or not we can prune stale
webhooks. While not wrong, it lead to a bunch of ~unnecessary
operations, especially given that we only prune once a day currently.
Here we move pruning to `peer_connected`/`peer_disconnected`, which is
similar to what we do for LSPS2, and should still be more than enough.

Author: tnull

lightning-liquidity/src/lsps5/service.rs

@@ -183,7 +183,6 @@ where
 		let mut message_queue_notifier = self.pending_messages.notifier();
 
 		let mut outer_state_lock = self.per_peer_state.write().unwrap();
-		self.check_prune_stale_webhooks(&mut outer_state_lock);
 
 		let peer_state_lock =
 			outer_state_lock.entry(counterparty_node_id).or_insert_with(PeerState::default);
@@ -264,9 +263,7 @@ where
 	) -> Result<(), LightningError> {
 		let mut message_queue_notifier = self.pending_messages.notifier();
 
-		let mut outer_state_lock = self.per_peer_state.write().unwrap();
-		self.check_prune_stale_webhooks(&mut outer_state_lock);
-
+		let outer_state_lock = self.per_peer_state.read().unwrap();
 		let app_names =
 			outer_state_lock.get(&counterparty_node_id).map(|p| p.app_names()).unwrap_or_default();
 
@@ -286,7 +283,6 @@ where
 		let mut message_queue_notifier = self.pending_messages.notifier();
 
 		let mut outer_state_lock = self.per_peer_state.write().unwrap();
-		self.check_prune_stale_webhooks(&mut outer_state_lock);
 
 		if let Some(peer_state) = outer_state_lock.get_mut(&counterparty_node_id) {
 			if peer_state.remove_webhook(&params.app_name) {
@@ -411,8 +407,6 @@ where
 		&self, client_id: PublicKey, notification: WebhookNotification,
 	) -> Result<(), LSPS5ProtocolError> {
 		let mut outer_state_lock = self.per_peer_state.write().unwrap();
-		self.check_prune_stale_webhooks(&mut outer_state_lock);
-
 		let peer_state = if let Some(peer_state) = outer_state_lock.get_mut(&client_id) {
 			peer_state
 		} else {
@@ -507,13 +501,15 @@ where
 		if let Some(peer_state) = outer_state_lock.get_mut(counterparty_node_id) {
 			peer_state.reset_notification_cooldown();
 		}
+		self.check_prune_stale_webhooks(&mut outer_state_lock);
 	}
 
 	pub(crate) fn peer_disconnected(&self, counterparty_node_id: &PublicKey) {
 		let mut outer_state_lock = self.per_peer_state.write().unwrap();
 		if let Some(peer_state) = outer_state_lock.get_mut(counterparty_node_id) {
 			peer_state.reset_notification_cooldown();
 		}
+		self.check_prune_stale_webhooks(&mut outer_state_lock);
 	}
 }
 

lightning-liquidity/tests/lsps5_integration_tests.rs

@@ -861,7 +861,15 @@ fn stale_webhooks() {
 		MIN_WEBHOOK_RETENTION_DAYS.as_secs() + PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS.as_secs(),
 	);
 
-	// LIST calls prune before executing -> should be empty after advancing time
+	// LIST should be empty after advancing time and reconnection
+	service_node.liquidity_manager.peer_disconnected(client_node_id);
+	let init_msg = Init {
+		features: lightning_types::features::InitFeatures::empty(),
+		remote_network_address: None,
+		networks: None,
+	};
+	service_node.liquidity_manager.peer_connected(client_node_id, &init_msg, false).unwrap();
+
 	let _ = client_handler.list_webhooks(service_node_id);
 	let list_req2 = get_lsps_message!(client_node, service_node_id);
 	service_node.liquidity_manager.handle_custom_message(list_req2, client_node_id).unwrap();
@@ -1068,7 +1076,7 @@ fn test_notify_without_webhooks_does_nothing() {
 }
 
 #[test]
-fn test_send_notifications_and_peer_connected_resets_cooldown() {
+fn test_notifications_and_peer_connected_resets_cooldown() {
 	let mock_time_provider = Arc::new(MockTimeProvider::new(1000));
 	let time_provider = Arc::<MockTimeProvider>::clone(&mock_time_provider);
 	let chanmon_cfgs = create_chanmon_cfgs(2);