Skip to content

Commit

Permalink
Merge pull request #2799 from benthecarman/tx-sync-wasm
Browse files Browse the repository at this point in the history
Don't call system time in no-std
  • Loading branch information
tnull committed Jan 8, 2024
2 parents 15b7f66 + f836794 commit 3c0420c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions ci/check-cfg-flags.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ def check_feature(feature):
pass
elif feature == "electrum":
pass
elif feature == "time":
pass
elif feature == "_test_utils":
pass
elif feature == "_test_vectors":
Expand Down
3 changes: 2 additions & 1 deletion lightning-transaction-sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[features]
default = []
default = ["time"]
time = []
esplora-async = ["async-interface", "esplora-client/async", "futures"]
esplora-async-https = ["esplora-async", "esplora-client/async-https-rustls"]
esplora-blocking = ["esplora-client/blocking"]
Expand Down
8 changes: 6 additions & 2 deletions lightning-transaction-sync/src/esplora.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use esplora_client::r#async::AsyncClient;
#[cfg(not(feature = "async-interface"))]
use esplora_client::blocking::BlockingClient;

use std::time::Instant;
use std::collections::HashSet;
use core::ops::Deref;

Expand Down Expand Up @@ -91,7 +90,8 @@ where
let mut sync_state = self.sync_state.lock().await;

log_trace!(self.logger, "Starting transaction sync.");
let start_time = Instant::now();
#[cfg(feature = "time")]
let start_time = std::time::Instant::now();
let mut num_confirmed = 0;
let mut num_unconfirmed = 0;

Expand Down Expand Up @@ -227,8 +227,12 @@ where
sync_state.pending_sync = false;
}
}
#[cfg(feature = "time")]
log_debug!(self.logger, "Finished transaction sync at tip {} in {}ms: {} confirmed, {} unconfirmed.",
tip_hash, start_time.elapsed().as_millis(), num_confirmed, num_unconfirmed);
#[cfg(not(feature = "time"))]
log_debug!(self.logger, "Finished transaction sync at tip {}: {} confirmed, {} unconfirmed.",
tip_hash, num_confirmed, num_unconfirmed);
Ok(())
}

Expand Down

0 comments on commit 3c0420c

Please sign in to comment.