WIP

Author: martinsaposnic

lightning-liquidity/Cargo.toml

@@ -16,7 +16,7 @@ categories = ["cryptography::cryptocurrencies"]
 [features]
 default = ["std", "time"]
 std = ["lightning/std"]
-time = []
+time = ["std"]
 backtrace = ["dep:backtrace"]
 
 [dependencies]

lightning-liquidity/src/lsps5/service.rs

@@ -89,21 +89,6 @@ pub struct LSPS5ServiceConfig {
 	pub notification_cooldown_hours: Duration,
 }
 
-/// Default maximum number of webhooks allowed per client.
-pub const DEFAULT_MAX_WEBHOOKS_PER_CLIENT: u32 = 10;
-/// Default notification cooldown time in hours.
-pub const DEFAULT_NOTIFICATION_COOLDOWN_HOURS: Duration = Duration::from_secs(24 * 60 * 60);
-
-impl Default for LSPS5ServiceConfig {
-	fn default() -> Self {
-		Self {
-			max_webhooks_per_client: DEFAULT_MAX_WEBHOOKS_PER_CLIENT,
-			signing_key: SecretKey::from_slice(&[1; 32]).expect("Static key should be valid"),
-			notification_cooldown_hours: DEFAULT_NOTIFICATION_COOLDOWN_HOURS,
-		}
-	}
-}
-
 /// Service for handling LSPS5 webhook registration
 pub struct LSPS5ServiceHandler<CM: Deref>
 where
@@ -184,8 +169,7 @@ where
 		Ok(())
 	}
 
-	/// Handle a set_webhook request.
-	pub fn handle_set_webhook(
+	fn handle_set_webhook(
 		&self, counterparty_node_id: PublicKey, request_id: LSPSRequestId,
 		params: SetWebhookRequest,
 	) -> Result<(), LightningError> {
@@ -259,8 +243,7 @@ where
 		Ok(())
 	}
 
-	/// Handle a list_webhooks request.
-	pub fn handle_list_webhooks(
+	fn handle_list_webhooks(
 		&self, counterparty_node_id: PublicKey, request_id: LSPSRequestId,
 		_params: ListWebhooksRequest,
 	) -> Result<(), LightningError> {
@@ -290,8 +273,7 @@ where
 		Ok(())
 	}
 
-	/// Handle a remove_webhook request.
-	pub fn handle_remove_webhook(
+	fn handle_remove_webhook(
 		&self, counterparty_node_id: PublicKey, request_id: LSPSRequestId,
 		params: RemoveWebhookRequest,
 	) -> Result<(), LightningError> {

lightning-liquidity/tests/common/mod.rs

@@ -685,6 +685,11 @@ fn advance_chain(node: &mut Node, num_blocks: u32) {
 	}
 }
 
+/// Default maximum number of webhooks allowed per client.
+pub(crate) const DEFAULT_MAX_WEBHOOKS_PER_CLIENT: u32 = 10;
+/// Default notification cooldown time in hours.
+pub(crate) const DEFAULT_NOTIFICATION_COOLDOWN_HOURS: Duration = Duration::from_secs(24 * 60 * 60);
+
 pub(crate) fn get_client_and_service(
 	time_provider: Option<Arc<dyn TimeProvider>>,
 ) -> (
@@ -696,7 +701,11 @@ pub(crate) fn get_client_and_service(
 	&'static Node,
 ) {
 	let signing_key = SecretKey::from_slice(&[42; 32]).unwrap();
-	let mut lsps5_service_config = LSPS5ServiceConfig::default();
+	let mut lsps5_service_config = LSPS5ServiceConfig {
+		max_webhooks_per_client: DEFAULT_MAX_WEBHOOKS_PER_CLIENT,
+		signing_key,
+		notification_cooldown_hours: DEFAULT_NOTIFICATION_COOLDOWN_HOURS,
+	};
 	lsps5_service_config.signing_key = signing_key;
 	let service_config = LiquidityServiceConfig {
 		#[cfg(lsps1_service)]

lightning-liquidity/tests/lsps5_integration_tests.rs

@@ -2,7 +2,7 @@
 
 mod common;
 
-use common::{get_client_and_service, get_lsps_message};
+use common::{get_client_and_service, get_lsps_message, DEFAULT_MAX_WEBHOOKS_PER_CLIENT};
 use lightning::ln::msgs::LightningError;
 use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::util::hash_tables::HashSet;
@@ -11,7 +11,7 @@ use lightning_liquidity::lsps5::event::{LSPS5ClientEvent, LSPS5ServiceEvent};
 use lightning_liquidity::lsps5::msgs::{
 	LSPS5AppName, LSPS5Error, LSPS5WebhookUrl, WebhookNotification, WebhookNotificationMethod,
 };
-use lightning_liquidity::lsps5::service::{LSPS5ServiceConfig, TimeProvider};
+use lightning_liquidity::lsps5::service::TimeProvider;
 use lightning_liquidity::lsps5::service::{
 	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
 };
@@ -103,7 +103,6 @@ fn webhook_registration_flow() {
 		},
 		_ => panic!("Expected SendWebhookNotifications event"),
 	}
-
 	let set_webhook_response = get_lsps_message!(service_node, client_node_id);
 
 	client_node
@@ -123,7 +122,7 @@ fn webhook_registration_flow() {
 			request_id: req_id,
 		}) => {
 			assert_eq!(num_webhooks, 1);
-			assert_eq!(max_webhooks, LSPS5ServiceConfig::default().max_webhooks_per_client);
+			assert_eq!(max_webhooks, DEFAULT_MAX_WEBHOOKS_PER_CLIENT);
 			assert_eq!(no_change, false);
 			assert_eq!(lsp, service_node_id);
 			assert_eq!(an, app_name.clone());
@@ -154,7 +153,7 @@ fn webhook_registration_flow() {
 		}) => {
 			assert_eq!(app_names, vec![app_name.clone()]);
 			assert_eq!(counterparty_node_id, client_node_id);
-			assert_eq!(max_webhooks, LSPS5ServiceConfig::default().max_webhooks_per_client);
+			assert_eq!(max_webhooks, DEFAULT_MAX_WEBHOOKS_PER_CLIENT);
 			assert_eq!(req_id, list_request_id);
 		},
 		_ => panic!("Unexpected event"),
@@ -177,7 +176,7 @@ fn webhook_registration_flow() {
 		}) => {
 			assert_eq!(lsp, service_node_id);
 			assert_eq!(app_names, vec![app_name.clone()]);
-			assert_eq!(max_webhooks, LSPS5ServiceConfig::default().max_webhooks_per_client);
+			assert_eq!(max_webhooks, DEFAULT_MAX_WEBHOOKS_PER_CLIENT);
 			assert_eq!(request_id, list_request_id);
 		},
 		_ => panic!("Unexpected event"),
@@ -352,8 +351,7 @@ fn webhook_error_handling_test() {
 	// TEST 5: Too many webhooks - register the max number and then try one more
 	let valid_app_name_base = "Valid App";
 	let valid_url = "https://example.org/webhook";
-
-	for i in 0..LSPS5ServiceConfig::default().max_webhooks_per_client {
+	for i in 0..DEFAULT_MAX_WEBHOOKS_PER_CLIENT {
 		let app_name = format!("{} {}", valid_app_name_base, i);
 		let _ = client_handler
 			.set_webhook(service_node_id, app_name, valid_url.to_string())
@@ -369,11 +367,7 @@ fn webhook_error_handling_test() {
 	}
 
 	// Now try to add one more webhook - should fail with too many webhooks error
-	let raw_one_too_many = format!(
-		"{} {}",
-		valid_app_name_base,
-		LSPS5ServiceConfig::default().max_webhooks_per_client
-	);
+	let raw_one_too_many = format!("{} {}", valid_app_name_base, DEFAULT_MAX_WEBHOOKS_PER_CLIENT);
 	let one_too_many = LSPS5AppName::from_string(raw_one_too_many.to_string()).unwrap();
 	let _ = client_handler
 		.set_webhook(service_node_id, raw_one_too_many.clone(), valid_url.to_string())
@@ -396,7 +390,7 @@ fn webhook_error_handling_test() {
 		}) => {
 			let error_to_check = LSPS5Error::TooManyWebhooks(format!(
 				"Maximum of {} webhooks allowed per client",
-				LSPS5ServiceConfig::default().max_webhooks_per_client
+				DEFAULT_MAX_WEBHOOKS_PER_CLIENT
 			));
 			assert_eq!(error, error_to_check);
 			assert_eq!(app_name, one_too_many);