Skip to content

Commit e499084

Browse files
WIP
1 parent 004c5c3 commit e499084

File tree

13 files changed

+1551
-1266
lines changed

13 files changed

+1551
-1266
lines changed

lightning-background-processor/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ rustdoc-args = ["--cfg", "docsrs"]
1616
[features]
1717
futures = [ ]
1818
std = ["lightning/std", "lightning-liquidity/std", "bitcoin-io/std", "bitcoin_hashes/std"]
19-
20-
default = ["std"]
19+
time = ["std"]
20+
default = ["std", "time"]
2121

2222
[dependencies]
2323
bitcoin = { version = "0.32.2", default-features = false }

lightning-background-processor/src/lib.rs

+14-2
Original file line numberDiff line numberDiff line change
@@ -1142,6 +1142,7 @@ mod tests {
11421142
use lightning::util::sweep::{OutputSpendStatus, OutputSweeper, PRUNE_DELAY_BLOCKS};
11431143
use lightning::util::test_utils;
11441144
use lightning::{get_event, get_event_msg};
1145+
use lightning_liquidity::lsps5::service::TimeProvider;
11451146
use lightning_liquidity::LiquidityManager;
11461147
use lightning_persister::fs_store::FilesystemStore;
11471148
use lightning_rapid_gossip_sync::RapidGossipSync;
@@ -1578,6 +1579,16 @@ mod tests {
15781579
path.to_str().unwrap().to_string()
15791580
}
15801581

1582+
pub struct DefaultTimeProvider;
1583+
1584+
#[cfg(feature = "std")]
1585+
impl TimeProvider for DefaultTimeProvider {
1586+
fn duration_since_epoch(&self) -> Duration {
1587+
use std::time::{SystemTime, UNIX_EPOCH};
1588+
SystemTime::now().duration_since(UNIX_EPOCH).expect("system time before Unix epoch")
1589+
}
1590+
}
1591+
15811592
fn create_nodes(num_nodes: usize, persist_dir: &str) -> (String, Vec<Node>) {
15821593
let persist_temp_path = env::temp_dir().join(persist_dir);
15831594
let persist_dir = persist_temp_path.to_string_lossy().to_string();
@@ -1676,14 +1687,15 @@ mod tests {
16761687
logger.clone(),
16771688
keys_manager.clone(),
16781689
));
1679-
let liquidity_manager = Arc::new(LiquidityManager::new(
1690+
let time_provider = Arc::new(DefaultTimeProvider);
1691+
let liquidity_manager = Arc::new(LiquidityManager::new_with_custom_time_provider(
16801692
Arc::clone(&keys_manager),
16811693
Arc::clone(&manager),
16821694
None,
16831695
None,
16841696
None,
16851697
None,
1686-
None,
1698+
time_provider,
16871699
));
16881700
let node = Node {
16891701
node: manager,

lightning-liquidity/src/lsps0/ser.rs

-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
592592
.map_err(de::Error::custom)?;
593593
Ok(LSPSMessage::LSPS2(LSPS2Message::Request(id, LSPS2Request::Buy(request))))
594594
},
595-
// Add LSPS5 methods
596595
LSPSMethod::LSPS5SetWebhook => {
597596
let request = serde_json::from_value(params.unwrap_or(json!({})))
598597
.map_err(de::Error::custom)?;

0 commit comments

Comments
 (0)