fixup: fix comment on msgs, don't check for rate_limit on webhook_registered notif

Author: martinsaposnic

lightning-liquidity/src/lsps5/msgs.rs

@@ -116,7 +116,7 @@ pub enum LSPS5ProtocolError {
 }
 
 impl LSPS5ProtocolError {
-	/// private code range so we never collide with the spec's codes
+	/// The error code for the LSPS5 protocol error.
 	pub fn code(&self) -> i32 {
 		match self {
 			LSPS5ProtocolError::AppNameTooLong | LSPS5ProtocolError::WebhookUrlTooLong => {

lightning-liquidity/src/lsps5/service.rs

@@ -221,27 +221,23 @@ where
 		}
 
 		if !no_change {
-			let result = self.send_webhook_registered_notification(
+			self.send_webhook_registered_notification(
 				counterparty_node_id,
 				params.app_name,
 				params.webhook,
-			);
-
-			// If the send_notification failed because of a SLOW_DOWN_ERROR, it means we sent this
-			// notification recently, and the user has not seen it yet. It's safe to continue, but we still need to handle other error types.
-			if result.is_err() && !matches!(result, Err(LSPS5ProtocolError::SlowDownError)) {
-				let e = result.unwrap_err();
+			)
+			.map_err(|e| {
 				let msg = LSPS5Message::Response(
 					request_id.clone(),
 					LSPS5Response::SetWebhookError(e.clone().into()),
 				)
 				.into();
 				self.pending_messages.enqueue(&counterparty_node_id, msg);
-				return Err(LightningError {
+				LightningError {
 					err: e.message().into(),
 					action: ErrorAction::IgnoreAndLog(Level::Info),
-				});
-			}
+				}
+			})?;
 		}
 
 		let msg = LSPS5Message::Response(
@@ -419,16 +415,22 @@ where
 		let now =
 			LSPSDateTime::new_from_duration_since_epoch(self.time_provider.duration_since_epoch());
 
-		let rate_limit_applies = client_webhooks.iter().any(|(_, webhook)| {
-			webhook
-				.last_notification_sent
-				.get(&notification.method)
-				.map(|last_sent| now.abs_diff(&last_sent))
-				.map_or(false, |duration| duration < DEFAULT_NOTIFICATION_COOLDOWN_HOURS.as_secs())
-		});
-
-		if rate_limit_applies {
-			return Err(LSPS5ProtocolError::SlowDownError);
+		// We must avoid sending multiple notifications of the same method
+		// (other than lsps5.webhook_registered) close in time.
+		if notification.method != WebhookNotificationMethod::LSPS5WebhookRegistered {
+			let rate_limit_applies = client_webhooks.iter().any(|(_, webhook)| {
+				webhook
+					.last_notification_sent
+					.get(&notification.method)
+					.map(|last_sent| now.abs_diff(&last_sent))
+					.map_or(false, |duration| {
+						duration < DEFAULT_NOTIFICATION_COOLDOWN_HOURS.as_secs()
+					})
+			});
+
+			if rate_limit_applies {
+				return Err(LSPS5ProtocolError::SlowDownError);
+			}
 		}
 
 		for (app_name, webhook) in client_webhooks.iter_mut() {