testing CI

Author: martinsaposnic

lightning-liquidity/Cargo.toml

@@ -18,6 +18,7 @@ default = ["std", "time"]
 std = ["lightning/std"]
 time = ["std"]
 backtrace = ["dep:backtrace"]
+_test_utils = []
 
 [dependencies]
 lightning = { version = "0.2.0", path = "../lightning", default-features = false }
@@ -48,4 +49,5 @@ check-cfg = [
 	"cfg(c_bindings)",
 	"cfg(backtrace)",
 	"cfg(ldk_bench)",
+	"cfg(_test_utils)",
 ]

lightning-liquidity/src/lsps5/service.rs

@@ -61,11 +61,11 @@ pub trait TimeProvider {
 	/// Get the current time as a duration since the Unix epoch.
 	fn duration_since_epoch(&self) -> Duration;
 
-	// TODO: only on tests
+	#[cfg(feature = "_test_utils")]
 	/// Advance the time by a specified number of seconds.
 	fn advance_time(&self, _seconds: u64);
 
-	// TODO: only on tests
+	#[cfg(feature = "_test_utils")]
 	/// Rewind the time by a specified number of seconds.
 	fn rewind_time(&self, _seconds: u64);
 }
@@ -81,14 +81,6 @@ impl TimeProvider for DefaultTimeProvider {
 		use std::time::{SystemTime, UNIX_EPOCH};
 		SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
 	}
-
-	fn advance_time(&self, _seconds: u64) {
-		// No op for non-mock implementations
-	}
-
-	fn rewind_time(&self, _seconds: u64) {
-		// No op for non-mock implementations
-	}
 }
 
 /// Server-side configuration options for LSPS5 Webhook Registration.

lightning-liquidity/tests/common/mod.rs

@@ -132,7 +132,7 @@ pub(crate) struct Node {
 					Arc<KeysManager>,
 					Arc<ChannelManager>,
 					Arc<dyn Filter + Send + Sync>,
-					Arc<dyn TimeProvider>,
+					Arc<dyn TimeProvider + Send + Sync>,
 				>,
 			>,
 			Arc<KeysManager>,
@@ -144,7 +144,7 @@ pub(crate) struct Node {
 			Arc<KeysManager>,
 			Arc<ChannelManager>,
 			Arc<dyn Filter + Send + Sync>,
-			Arc<dyn TimeProvider>,
+			Arc<dyn TimeProvider + Send + Sync>,
 		>,
 	>,
 	pub(crate) chain_monitor: Arc<ChainMonitor>,
@@ -413,7 +413,8 @@ fn get_full_filepath(filepath: String, filename: String) -> String {
 
 pub(crate) fn create_liquidity_node(
 	i: usize, persist_dir: &str, network: Network, service_config: Option<LiquidityServiceConfig>,
-	client_config: Option<LiquidityClientConfig>, time_provider: Arc<dyn TimeProvider>,
+	client_config: Option<LiquidityClientConfig>,
+	time_provider: Arc<dyn TimeProvider + Send + Sync>,
 ) -> Node {
 	let tx_broadcaster = Arc::new(test_utils::TestBroadcaster::new(network));
 	let fee_estimator = Arc::new(test_utils::TestFeeEstimator::new(253));
@@ -506,7 +507,7 @@ pub(crate) fn create_liquidity_node(
 
 pub(crate) fn create_service_and_client_nodes(
 	persist_dir: &str, service_config: LiquidityServiceConfig,
-	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider>,
+	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider + Send + Sync>,
 ) -> (Node, Node) {
 	let persist_temp_path = env::temp_dir().join(persist_dir);
 	let persist_dir = persist_temp_path.to_string_lossy().to_string();

lightning-liquidity/tests/lsps5_integration_tests.rs

@@ -1,4 +1,4 @@
-#![cfg(all(test, feature = "time"))]
+#![cfg(all(test, feature = "time", feature = "_test_utils"))]
 
 mod common;
 
@@ -768,9 +768,10 @@ fn replay_prevention_test() {
 
 #[test]
 fn stale_webhooks() {
-	let mock_time_provider: Arc<dyn TimeProvider> = Arc::new(MockTimeProvider::new(1000));
+	let mock_time_provider = Arc::new(MockTimeProvider::new(1000));
+	let time_provider: Arc<dyn TimeProvider> = Arc::<MockTimeProvider>::clone(&mock_time_provider);
 	let (service_node_id, client_node_id, service_node, client_node) =
-		lsps5_test_setup(Arc::clone(&mock_time_provider), None);
+		lsps5_test_setup(time_provider, None);
 
 	let client_handler = client_node.liquidity_manager.lsps5_client_handler().unwrap();
 
@@ -982,14 +983,15 @@ fn test_bad_signature_notification() {
 
 #[test]
 fn test_timestamp_notification_window_validation() {
-	let mock_time_provider: Arc<dyn TimeProvider> = Arc::new(MockTimeProvider::new(
+	let mock_time_provider = Arc::new(MockTimeProvider::new(
 		SystemTime::now()
 			.duration_since(UNIX_EPOCH)
 			.expect("system time before Unix epoch")
 			.as_secs(),
 	));
+	let time_provider: Arc<dyn TimeProvider> = Arc::<MockTimeProvider>::clone(&mock_time_provider);
 	let (service_node_id, client_node_id, service_node, client_node) =
-		lsps5_test_setup(Arc::clone(&mock_time_provider), None);
+		lsps5_test_setup(time_provider, None);
 
 	let client_handler = client_node.liquidity_manager.lsps5_client_handler().unwrap();
 	let service_handler = service_node.liquidity_manager.lsps5_service_handler().unwrap();