fixup: refactor tests to match reviewed PR #3712. Also improve readability and reduce indentation in some places

Author: martinsaposnic

lightning-liquidity/tests/common/mod.rs

@@ -67,7 +67,7 @@ type LockingWrapper<T> = lightning::routing::scoring::MultiThreadedLockableScore
 #[cfg(not(c_bindings))]
 type LockingWrapper<T> = std::sync::Mutex<T>;
 
-pub(crate) type ChannelManager = channelmanager::ChannelManager<
+type ChannelManager = channelmanager::ChannelManager<
 	Arc<ChainMonitor>,
 	Arc<test_utils::TestBroadcaster>,
 	Arc<KeysManager>,

lightning-liquidity/tests/lsps2_integration_tests.rs

@@ -55,7 +55,7 @@ fn setup_test_lsps2(
 	};
 
 	let (service_node, client_node) =
-		create_service_and_client_nodes("webhook_registration_flow", service_config, client_config);
+		create_service_and_client_nodes("default_persist_dir", service_config, client_config);
 
 	let secp = bitcoin::secp256k1::Secp256k1::new();
 	let service_node_id = bitcoin::secp256k1::PublicKey::from_secret_key(&secp, &signing_key);
@@ -130,17 +130,17 @@ fn invoice_generation_flow() {
 	service_node.liquidity_manager.handle_custom_message(get_info_request, client_node_id).unwrap();
 
 	let get_info_event = service_node.liquidity_manager.next_event().unwrap();
-	match get_info_event {
-		LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::GetInfo {
-			request_id,
-			counterparty_node_id,
-			token,
-		}) => {
-			assert_eq!(request_id, get_info_request_id);
-			assert_eq!(counterparty_node_id, client_node_id);
-			assert_eq!(token, None);
-		},
-		_ => panic!("Unexpected event"),
+	if let LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::GetInfo {
+		request_id,
+		counterparty_node_id,
+		token,
+	}) = get_info_event
+	{
+		assert_eq!(request_id, get_info_request_id);
+		assert_eq!(counterparty_node_id, client_node_id);
+		assert_eq!(token, None);
+	} else {
+		panic!("Unexpected event");
 	}
 
 	let raw_opening_params = LSPS2RawOpeningFeeParams {
@@ -192,19 +192,19 @@ fn invoice_generation_flow() {
 	service_node.liquidity_manager.handle_custom_message(buy_request, client_node_id).unwrap();
 
 	let buy_event = service_node.liquidity_manager.next_event().unwrap();
-	match buy_event {
-		LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::BuyRequest {
-			request_id,
-			counterparty_node_id,
-			opening_fee_params: ofp,
-			payment_size_msat: psm,
-		}) => {
-			assert_eq!(request_id, buy_request_id);
-			assert_eq!(counterparty_node_id, client_node_id);
-			assert_eq!(opening_fee_params, ofp);
-			assert_eq!(payment_size_msat, psm);
-		},
-		_ => panic!("Unexpected event"),
+	if let LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::BuyRequest {
+		request_id,
+		counterparty_node_id,
+		opening_fee_params: ofp,
+		payment_size_msat: psm,
+	}) = buy_event
+	{
+		assert_eq!(request_id, buy_request_id);
+		assert_eq!(counterparty_node_id, client_node_id);
+		assert_eq!(opening_fee_params, ofp);
+		assert_eq!(payment_size_msat, psm);
+	} else {
+		panic!("Unexpected event");
 	}
 
 	let user_channel_id = 42;
@@ -227,22 +227,22 @@ fn invoice_generation_flow() {
 	client_node.liquidity_manager.handle_custom_message(buy_response, service_node_id).unwrap();
 
 	let invoice_params_event = client_node.liquidity_manager.next_event().unwrap();
-	match invoice_params_event {
-		LiquidityEvent::LSPS2Client(LSPS2ClientEvent::InvoiceParametersReady {
-			request_id,
-			counterparty_node_id,
-			intercept_scid: iscid,
-			cltv_expiry_delta: ced,
-			payment_size_msat: psm,
-		}) => {
-			assert_eq!(request_id, buy_request_id);
-			assert_eq!(counterparty_node_id, service_node_id);
-			assert_eq!(intercept_scid, iscid);
-			assert_eq!(cltv_expiry_delta, ced);
-			assert_eq!(payment_size_msat, psm);
-		},
-		_ => panic!("Unexpected event"),
-	};
+	if let LiquidityEvent::LSPS2Client(LSPS2ClientEvent::InvoiceParametersReady {
+		request_id,
+		counterparty_node_id,
+		intercept_scid: iscid,
+		cltv_expiry_delta: ced,
+		payment_size_msat: psm,
+	}) = invoice_params_event
+	{
+		assert_eq!(request_id, buy_request_id);
+		assert_eq!(counterparty_node_id, service_node_id);
+		assert_eq!(intercept_scid, iscid);
+		assert_eq!(cltv_expiry_delta, ced);
+		assert_eq!(payment_size_msat, psm);
+	} else {
+		panic!("Unexpected event");
+	}
 
 	let description = "asdf";
 	let expiry_secs = 3600;
@@ -685,40 +685,40 @@ fn invalid_token_flow() {
 	service_node.liquidity_manager.handle_custom_message(get_info_request, client_node_id).unwrap();
 
 	let get_info_event = service_node.liquidity_manager.next_event().unwrap();
-	match get_info_event {
-		LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::GetInfo {
-			request_id,
-			counterparty_node_id,
-			token,
-		}) => {
-			assert_eq!(request_id, get_info_request_id);
-			assert_eq!(counterparty_node_id, client_node_id);
-			assert_eq!(token, Some("invalid_token".to_string()));
-
-			// Service rejects the token as invalid
-			service_handler.invalid_token_provided(&client_node_id, request_id.clone()).unwrap();
-
-			// Attempt to respond to the same request again which should fail
-			// because the request has been removed from pending_requests
-			let raw_opening_params = LSPS2RawOpeningFeeParams {
-				min_fee_msat: 100,
-				proportional: 21,
-				valid_until: LSPSDateTime::from_str("2035-05-20T08:30:45Z").unwrap(),
-				min_lifetime: 144,
-				max_client_to_self_delay: 128,
-				min_payment_size_msat: 1,
-				max_payment_size_msat: 100_000_000,
-			};
-
-			let result = service_handler.opening_fee_params_generated(
-				&client_node_id,
-				request_id.clone(),
-				vec![raw_opening_params],
-			);
+	if let LiquidityEvent::LSPS2Service(LSPS2ServiceEvent::GetInfo {
+		request_id,
+		counterparty_node_id,
+		token,
+	}) = get_info_event
+	{
+		assert_eq!(request_id, get_info_request_id);
+		assert_eq!(counterparty_node_id, client_node_id);
+		assert_eq!(token, Some("invalid_token".to_string()));
+
+		// Service rejects the token as invalid
+		service_handler.invalid_token_provided(&client_node_id, request_id.clone()).unwrap();
+
+		// Attempt to respond to the same request again which should fail
+		// because the request has been removed from pending_requests
+		let raw_opening_params = LSPS2RawOpeningFeeParams {
+			min_fee_msat: 100,
+			proportional: 21,
+			valid_until: LSPSDateTime::from_str("2035-05-20T08:30:45Z").unwrap(),
+			min_lifetime: 144,
+			max_client_to_self_delay: 128,
+			min_payment_size_msat: 1,
+			max_payment_size_msat: 100_000_000,
+		};
+
+		let result = service_handler.opening_fee_params_generated(
+			&client_node_id,
+			request_id.clone(),
+			vec![raw_opening_params],
+		);
 
-			assert!(result.is_err(), "Request should have been removed from pending_requests");
-		},
-		_ => panic!("Unexpected event"),
+		assert!(result.is_err(), "Request should have been removed from pending_requests");
+	} else {
+		panic!("Unexpected event");
 	}
 
 	let get_info_error_response = get_lsps_message!(service_node, client_node_id);
@@ -729,16 +729,16 @@ fn invalid_token_flow() {
 		.unwrap_err();
 
 	let error_event = client_node.liquidity_manager.next_event().unwrap();
-	match error_event {
-		LiquidityEvent::LSPS2Client(LSPS2ClientEvent::GetInfoFailed {
-			request_id,
-			counterparty_node_id,
-			error,
-		}) => {
-			assert_eq!(request_id, get_info_request_id);
-			assert_eq!(counterparty_node_id, service_node_id);
-			assert_eq!(error.code, 200); // LSPS2_GET_INFO_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE
-		},
-		_ => panic!("Expected LSPS2ClientEvent::GetInfoFailed event"),
+	if let LiquidityEvent::LSPS2Client(LSPS2ClientEvent::GetInfoFailed {
+		request_id,
+		counterparty_node_id,
+		error,
+	}) = error_event
+	{
+		assert_eq!(request_id, get_info_request_id);
+		assert_eq!(counterparty_node_id, service_node_id);
+		assert_eq!(error.code, 200); // LSPS2_GET_INFO_REQUEST_UNRECOGNIZED_OR_STALE_TOKEN_ERROR_CODE
+	} else {
+		panic!("Expected LSPS2ClientEvent::GetInfoFailed event");
 	}
 }