diff --git a/benches/payments.rs b/benches/payments.rs index 75b7f0513..86dee39d8 100644 --- a/benches/payments.rs +++ b/benches/payments.rs @@ -1,8 +1,8 @@ #[path = "../tests/common/mod.rs"] mod common; -use std::time::Instant; -use std::{sync::Arc, time::Duration}; +use std::sync::Arc; +use std::time::{Duration, Instant}; use bitcoin::hex::DisplayHex; use bitcoin::Amount; diff --git a/src/lib.rs b/src/lib.rs index 6a26c6c5b..fb0fb9f66 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -107,7 +107,6 @@ use std::net::ToSocketAddrs; use std::sync::{Arc, Mutex, RwLock}; use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; -use crate::scoring::setup_background_pathfinding_scores_sync; pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance}; use bitcoin::secp256k1::PublicKey; #[cfg(feature = "uniffi")] @@ -158,12 +157,13 @@ use types::{ pub use types::{ ChannelDetails, CustomTlvRecord, DynStore, PeerDetails, SyncAndAsyncKVStore, UserChannelId, }; - pub use { bip39, bitcoin, lightning, lightning_invoice, lightning_liquidity, lightning_types, tokio, vss_client, }; +use crate::scoring::setup_background_pathfinding_scores_sync; + #[cfg(feature = "uniffi")] uniffi::include_scaffolding!("ldk_node"); diff --git a/src/scoring.rs b/src/scoring.rs index 107f63f65..e85abade3 100644 --- a/src/scoring.rs +++ b/src/scoring.rs @@ -1,22 +1,18 @@ -use std::{ - io::Cursor, - sync::{Arc, Mutex, RwLock}, - time::{Duration, SystemTime}, -}; +use std::io::Cursor; +use std::sync::{Arc, Mutex, RwLock}; +use std::time::{Duration, SystemTime}; -use crate::{ - config::{ - EXTERNAL_PATHFINDING_SCORES_SYNC_INTERVAL, EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS, - }, - io::utils::write_external_pathfinding_scores_to_cache, - logger::LdkLogger, - runtime::Runtime, - NodeMetrics, Scorer, -}; -use crate::{write_node_metrics, DynStore, Logger}; -use lightning::{ - log_error, log_info, log_trace, routing::scoring::ChannelLiquidities, util::ser::Readable, +use lightning::routing::scoring::ChannelLiquidities; +use lightning::util::ser::Readable; +use lightning::{log_error, log_info, log_trace}; + +use crate::config::{ + EXTERNAL_PATHFINDING_SCORES_SYNC_INTERVAL, EXTERNAL_PATHFINDING_SCORES_SYNC_TIMEOUT_SECS, }; +use crate::io::utils::write_external_pathfinding_scores_to_cache; +use crate::logger::LdkLogger; +use crate::runtime::Runtime; +use crate::{write_node_metrics, DynStore, Logger, NodeMetrics, Scorer}; /// Start a background task that periodically downloads scores via an external url and merges them into the local /// pathfinding scores. diff --git a/src/types.rs b/src/types.rs index 71512b2cd..b8dc10b18 100644 --- a/src/types.rs +++ b/src/types.rs @@ -18,8 +18,7 @@ use lightning::ln::peer_handler::IgnoringMessageHandler; use lightning::ln::types::ChannelId; use lightning::routing::gossip; use lightning::routing::router::DefaultRouter; -use lightning::routing::scoring::CombinedScorer; -use lightning::routing::scoring::ProbabilisticScoringFeeParameters; +use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters}; use lightning::sign::InMemorySigner; use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersister}; use lightning::util::ser::{Readable, Writeable, Writer};