Skip to content

LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 1 commit into from
Jul 26, 2025
Merged

LSPS5 follow up: Move TimeProvider to utils::time module for better organization #3962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
use lightning::util::test_utils;
use lightning::{get_event, get_event_msg};
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::LiquidityManager;
use lightning_persister::fs_store::FilesystemStore;
use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down
2 changes: 1 addition & 1 deletion lightning-liquidity/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down
7 changes: 3 additions & 4 deletions lightning-liquidity/src/lsps5/client.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

use super::*;
use crate::{
lsps0::ser::LSPSRequestId,
lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
tests::utils::TestEntropy,
lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
utils::time::DefaultTimeProvider,
};
use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down
23 changes: 1 addition & 22 deletions lightning-liquidity/src/lsps5/service.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
/// Get the current time as a duration since the Unix epoch.
fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
fn duration_since_epoch(&self) -> Duration {
use std::time::{SystemTime, UNIX_EPOCH};
SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down
2 changes: 1 addition & 1 deletion lightning-liquidity/src/lsps5/validator.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down
7 changes: 4 additions & 3 deletions lightning-liquidity/src/manager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down
6 changes: 6 additions & 0 deletions lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
let mut res = String::with_capacity(2 * value.len());
for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
assert_eq!(vout_from_scid(scid), vout);
}
}

pub mod time;
25 changes: 25 additions & 0 deletions lightning-liquidity/src/utils/time.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
/// Get the current time as a duration since the Unix epoch.
fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
fn duration_since_epoch(&self) -> Duration {
use std::time::{SystemTime, UNIX_EPOCH};
SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
}
}
7 changes: 4 additions & 3 deletions lightning-liquidity/tests/common/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down
3 changes: 2 additions & 1 deletion lightning-liquidity/tests/lsps0_integration_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down
2 changes: 1 addition & 1 deletion lightning-liquidity/tests/lsps2_integration_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down
3 changes: 2 additions & 1 deletion lightning-liquidity/tests/lsps5_integration_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
LSPS5 follow up: Move TimeProvider to utils::time module for better organization by martinsaposnic · Pull Request #3962 · lightningdevkit/rust-lightning · GitHub
Skip to content
LSPS5 follow up: Move TimeProvider to utils::time module for better organization#3962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 1 commit into

from

Jul 26, 2025
 Merged


LSPS5 follow up: Move TimeProvider to utils::time module for better organization
#3962
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -735,7 +735,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
/// # use lightning_background_processor::{process_events_async, GossipSync};
/// # use core::future::Future;
/// # use core::pin::Pin;
/// # use lightning_liquidity::lsps5::service::TimeProvider;
/// # use lightning_liquidity::utils::time::TimeProvider;
/// # struct Logger {}
/// # impl lightning::util::logger::Logger for Logger {
/// # fn log(&self, _record: lightning::util::logger::Record) {}
Expand DownExpand Up@@ -1401,7 +1401,7 @@ mod tests {
	use lightning::util::sweep::{OutputSpendStatus, OutputSweeperSync, PRUNE_DELAY_BLOCKS};
	use lightning::util::test_utils;
	use lightning::{get_event, get_event_msg};
	use lightning_liquidity::lsps5::service::DefaultTimeProvider;
	use lightning_liquidity::utils::time::DefaultTimeProvider;
	use lightning_liquidity::LiquidityManager;
	use lightning_persister::fs_store::FilesystemStore;
	use lightning_rapid_gossip_sync::RapidGossipSync;
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ pub mod message_queue;
mod sync;
#[cfg(test)]
mod tests;
mod utils;
pub mod utils;

pub use manager::{
	ALiquidityManager, LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig,
Expand Down

7 changes: 3 additions & 4 deletions
lightning-liquidity/src/lsps5/client.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,9 @@ use crate::message_queue::MessageQueue;
use crate::prelude::{new_hash_map, HashMap};
use crate::sync::{Arc, Mutex, RwLock};
use crate::utils::generate_request_id;
use crate::utils::time::TimeProvider;

use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
use super::service::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -439,9 +439,8 @@ mod tests {

	use super::*;
	use crate::{
 lsps0::ser::LSPSRequestId,
 lsps5::{msgs::SetWebhookResponse, service::DefaultTimeProvider},
 tests::utils::TestEntropy,
 lsps0::ser::LSPSRequestId, lsps5::msgs::SetWebhookResponse, tests::utils::TestEntropy,
 utils::time::DefaultTimeProvider,
	};
	use bitcoin::{key::Secp256k1, secp256k1::SecretKey};

Expand Down

23 changes: 1 addition & 22 deletions
lightning-liquidity/src/lsps5/service.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ use crate::message_queue::MessageQueue;
use crate::prelude::hash_map::Entry;
use crate::prelude::*;
use crate::sync::{Arc, Mutex};
use crate::utils::time::TimeProvider;

use bitcoin::secp256k1::PublicKey;

Expand DownExpand Up@@ -54,28 +55,6 @@ struct StoredWebhook {
	last_notification_sent: HashMap<WebhookNotificationMethod, LSPSDateTime>,
}

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

/// Server-side configuration options for LSPS5 Webhook Registration.
#[derive(Clone, Debug)]
pub struct LSPS5ServiceConfig {
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/src/lsps5/validator.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,12 +10,12 @@
//! LSPS5 Validator

use super::msgs::LSPS5ClientError;
use super::service::TimeProvider;

use crate::alloc::string::ToString;
use crate::lsps0::ser::LSPSDateTime;
use crate::lsps5::msgs::WebhookNotification;
use crate::sync::Mutex;
use crate::utils::time::TimeProvider;

use lightning::util::message_signing;

Expand Down

7 changes: 4 additions & 3 deletions
lightning-liquidity/src/manager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,7 @@ use crate::lsps0::ser::{
use crate::lsps0::service::LSPS0ServiceHandler;
use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
use crate::lsps5::msgs::LSPS5Message;
#[cfg(feature = "time")]
use crate::lsps5::service::DefaultTimeProvider;
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler};
use crate::message_queue::MessageQueue;

use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
Expand All@@ -27,6 +25,9 @@ use crate::lsps2::msgs::LSPS2Message;
use crate::lsps2::service::{LSPS2ServiceConfig, LSPS2ServiceHandler};
use crate::prelude::{new_hash_map, new_hash_set, HashMap, HashSet};
use crate::sync::{Arc, Mutex, RwLock};
#[cfg(feature = "time")]
use crate::utils::time::DefaultTimeProvider;
use crate::utils::time::TimeProvider;

use lightning::chain::{self, BestBlock, Confirm, Filter, Listen};
use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
Expand Down

6 changes: 6 additions & 0 deletions
lightning-liquidity/src/utils.rs → lightning-liquidity/src/utils/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
//! Utilities for LSPS5 service.

use alloc::string::String;
use core::{fmt::Write, ops::Deref};

use lightning::sign::EntropySource;

use crate::lsps0::ser::LSPSRequestId;

/// Converts a human-readable string representation of a short channel ID (SCID)
pub fn scid_from_human_readable_string(human_readable_scid: &str) -> Result<u64, ()> {
	let mut parts = human_readable_scid.split('x');

Expand All@@ -24,6 +27,7 @@ where
}

#[inline]
/// Converts a byte slice to a hexadecimal string representation.
pub fn hex_str(value: &[u8]) -> String {
	let mut res = String::with_capacity(2 * value.len());
	for v in value {
Expand DownExpand Up@@ -52,3 +56,5 @@ mod tests {
 assert_eq!(vout_from_scid(scid), vout);
	}
}

pub mod time;

25 changes: 25 additions & 0 deletions
lightning-liquidity/src/utils/time.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
//! Utilities for time handling in LSPS5 service.

use core::time::Duration;

/// Trait defining a time provider for LSPS5 service.
///
/// This trait is used to provide the current time for LSPS5 service operations
/// and to convert between timestamps and durations.
pub trait TimeProvider {
	/// Get the current time as a duration since the Unix epoch.
	fn duration_since_epoch(&self) -> Duration;
}

/// Default time provider using the system clock.
#[derive(Clone, Debug)]
#[cfg(feature = "time")]
pub struct DefaultTimeProvider;

#[cfg(feature = "time")]
impl TimeProvider for DefaultTimeProvider {
	fn duration_since_epoch(&self) -> Duration {
 use std::time::{SystemTime, UNIX_EPOCH};
 SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
	}
}

7 changes: 4 additions & 3 deletions
lightning-liquidity/tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
#![cfg(test)]

use bitcoin::Network;
use lightning::ln::channelmanager::ChainParameters;
use lightning_liquidity::lsps5::service::TimeProvider;
use lightning_liquidity::utils::time::TimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};

use lightning::chain::{BestBlock, Filter};
use lightning::ln::channelmanager::ChainParameters;
use lightning::ln::functional_test_utils::{Node, TestChannelManager};
use lightning::util::test_utils::TestKeysInterface;

use bitcoin::Network;

use core::ops::Deref;

use std::sync::Arc;
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps0_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,8 @@ use lightning_liquidity::lsps1::service::LSPS1ServiceConfig;
use lightning_liquidity::lsps2::client::LSPS2ClientConfig;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps5::client::LSPS5ClientConfig;
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::functional_test_utils::{
Expand Down

2 changes: 1 addition & 1 deletion
lightning-liquidity/tests/lsps2_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ use lightning_liquidity::lsps2::event::LSPS2ServiceEvent;
use lightning_liquidity::lsps2::msgs::LSPS2RawOpeningFeeParams;
use lightning_liquidity::lsps2::service::LSPS2ServiceConfig;
use lightning_liquidity::lsps2::utils::is_valid_opening_fee_params;
use lightning_liquidity::lsps5::service::DefaultTimeProvider;
use lightning_liquidity::utils::time::DefaultTimeProvider;
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};

use lightning::ln::channelmanager::{InterceptId, MIN_FINAL_CLTV_EXPIRY_DELTA};
Expand Down

3 changes: 2 additions & 1 deletion
lightning-liquidity/tests/lsps5_integration_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,13 +17,14 @@ use lightning_liquidity::lsps5::msgs::{
	LSPS5AppName, LSPS5ClientError, LSPS5ProtocolError, LSPS5WebhookUrl, WebhookNotification,
	WebhookNotificationMethod,
};
use lightning_liquidity::lsps5::service::{DefaultTimeProvider, LSPS5ServiceConfig, TimeProvider};
use lightning_liquidity::lsps5::service::LSPS5ServiceConfig;
use lightning_liquidity::lsps5::service::{
	MIN_WEBHOOK_RETENTION_DAYS, PRUNE_STALE_WEBHOOKS_INTERVAL_DAYS,
};
use lightning_liquidity::lsps5::validator::{
	InMemorySignatureStore, LSPS5Validator, SignatureStorageConfig,
};
use lightning_liquidity::utils::time::{DefaultTimeProvider, TimeProvider};
use lightning_liquidity::{LiquidityClientConfig, LiquidityServiceConfig};
use std::sync::{Arc, RwLock};
use std::time::{Duration, SystemTime, UNIX_EPOCH};
Expand Down
Loading