Remove LdkLite prefixes, resolve warnings

tnull · tnull · commit 14006160927b · 2022-10-20T11:33:29.000+02:00
diff --git a/src/access.rs b/src/access.rs
@@ -1,9 +1,7 @@
-use crate::error::LdkLiteError as Error;
-#[allow(unused_imports)]
 use crate::logger::{
-	log_error, log_given_level, log_info, log_internal, log_trace, log_warn, FilesystemLogger,
-	Logger,
+	log_error, log_given_level, log_internal, log_trace, FilesystemLogger, Logger,
 };
+use crate::Error;
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::WatchedOutput;
@@ -22,7 +20,7 @@ use std::sync::{Arc, Mutex};
 /// The minimum feerate we are allowed to send, as specify by LDK.
 const MIN_FEERATE: u32 = 253;
 
-pub struct LdkLiteChainAccess<D>
+pub struct ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -36,7 +34,7 @@ where
 	logger: Arc<FilesystemLogger>,
 }
 
-impl<D> LdkLiteChainAccess<D>
+impl<D> ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -275,7 +273,7 @@ where
 	}
 }
 
-impl<D> FeeEstimator for LdkLiteChainAccess<D>
+impl<D> FeeEstimator for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -288,7 +286,7 @@ where
 	}
 }
 
-impl<D> BroadcasterInterface for LdkLiteChainAccess<D>
+impl<D> BroadcasterInterface for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -303,7 +301,7 @@ where
 	}
 }
 
-impl<D> Filter for LdkLiteChainAccess<D>
+impl<D> Filter for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -317,7 +315,7 @@ where
 	}
 }
 
-impl<D> GetHeight for LdkLiteChainAccess<D>
+impl<D> GetHeight for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -326,7 +324,7 @@ where
 	}
 }
 
-impl<D> GetBlockHash for LdkLiteChainAccess<D>
+impl<D> GetBlockHash for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
@@ -335,7 +333,7 @@ where
 	}
 }
 
-impl<D> GetTx for LdkLiteChainAccess<D>
+impl<D> GetTx for ChainAccess<D>
 where
 	D: BatchDatabase,
 {
diff --git a/src/error.rs b/src/error.rs
@@ -3,7 +3,7 @@ use std::fmt;
 
 #[derive(Debug)]
 /// An error that possibly needs to be handled by the user.
-pub enum LdkLiteError {
+pub enum Error {
 	/// Returned when trying to start LdkLite while it is already running.
 	AlreadyRunning,
 	/// Returned when trying to stop LdkLite while it is not running.
@@ -36,7 +36,7 @@ pub enum LdkLiteError {
 	ChainAccessFailed,
 }
 
-impl fmt::Display for LdkLiteError {
+impl fmt::Display for Error {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		match *self {
 			Self::AlreadyRunning => write!(f, "LDKLite is already running."),
@@ -60,9 +60,9 @@ impl fmt::Display for LdkLiteError {
 	}
 }
 
-impl std::error::Error for LdkLiteError {}
+impl std::error::Error for Error {}
 
-impl From<bdk::Error> for LdkLiteError {
+impl From<bdk::Error> for Error {
 	fn from(e: bdk::Error) -> Self {
 		match e {
 			bdk::Error::Signer(_) => Self::WalletSigningFailed,
@@ -71,7 +71,7 @@ impl From<bdk::Error> for LdkLiteError {
 	}
 }
 
-impl From<esplora::EsploraError> for LdkLiteError {
+impl From<esplora::EsploraError> for Error {
 	fn from(_e: esplora::EsploraError) -> Self {
 		Self::ChainAccessFailed
 	}
diff --git a/src/event.rs b/src/event.rs
@@ -1,13 +1,9 @@
 use crate::{
-	hex_utils, ChannelManager, Error, FilesystemPersister, LdkLiteChainAccess, LdkLiteConfig,
-	NetworkGraph, PaymentInfo, PaymentInfoStorage, PaymentStatus,
+	hex_utils, ChainAccess, ChannelManager, Config, Error, FilesystemPersister, NetworkGraph,
+	PaymentInfo, PaymentInfoStorage, PaymentStatus,
 };
 
-#[allow(unused_imports)]
-use crate::logger::{
-	log_error, log_given_level, log_info, log_internal, log_trace, log_warn, FilesystemLogger,
-	Logger,
-};
+use crate::logger::{log_error, log_given_level, log_info, log_internal, FilesystemLogger, Logger};
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::keysinterface::KeysManager;
@@ -33,7 +29,7 @@ pub(crate) const EVENTS_PERSISTENCE_KEY: &str = "events";
 ///
 /// [`LdkLite`]: [`crate::LdkLite`]
 #[derive(Debug, Clone)]
-pub enum LdkLiteEvent {
+pub enum Event {
 	/// A payment we sent was successful.
 	PaymentSuccessful {
 		/// The hash of the payment.
@@ -66,7 +62,7 @@ pub enum LdkLiteEvent {
 	//}
 }
 
-impl Readable for LdkLiteEvent {
+impl Readable for Event {
 	fn read<R: lightning::io::Read>(
 		reader: &mut R,
 	) -> Result<Self, lightning::ln::msgs::DecodeError> {
@@ -102,7 +98,7 @@ impl Readable for LdkLiteEvent {
 	}
 }
 
-impl Writeable for LdkLiteEvent {
+impl Writeable for Event {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), lightning::io::Error> {
 		match self {
 			Self::PaymentSuccessful { payment_hash } => {
@@ -138,19 +134,19 @@ impl Writeable for LdkLiteEvent {
 	}
 }
 
-pub(crate) struct LdkLiteEventQueue<K: KVStorePersister> {
+pub(crate) struct EventQueue<K: KVStorePersister> {
 	queue: Mutex<EventQueueSerWrapper>,
 	notifier: Condvar,
 	persister: Arc<K>,
 }
 
-impl<K: KVStorePersister> LdkLiteEventQueue<K> {
+impl<K: KVStorePersister> EventQueue<K> {
 	pub(crate) fn new(persister: Arc<K>) -> Self {
 		let queue: Mutex<EventQueueSerWrapper> = Mutex::new(EventQueueSerWrapper(VecDeque::new()));
 		let notifier = Condvar::new();
 		Self { queue, notifier, persister }
 	}
-	pub(crate) fn add_event(&self, event: LdkLiteEvent) -> Result<(), Error> {
+	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
 		let mut locked_queue = self.queue.lock().unwrap();
 		locked_queue.0.push_back(event);
 
@@ -162,7 +158,7 @@ impl<K: KVStorePersister> LdkLiteEventQueue<K> {
 		Ok(())
 	}
 
-	pub(crate) fn next_event(&self) -> LdkLiteEvent {
+	pub(crate) fn next_event(&self) -> Event {
 		let locked_queue = self
 			.notifier
 			.wait_while(self.queue.lock().unwrap(), |queue| queue.0.is_empty())
@@ -181,7 +177,7 @@ impl<K: KVStorePersister> LdkLiteEventQueue<K> {
 	}
 }
 
-impl<K: KVStorePersister> ReadableArgs<Arc<K>> for LdkLiteEventQueue<K> {
+impl<K: KVStorePersister> ReadableArgs<Arc<K>> for EventQueue<K> {
 	#[inline]
 	fn read<R: lightning::io::Read>(
 		reader: &mut R, persister: Arc<K>,
@@ -192,7 +188,7 @@ impl<K: KVStorePersister> ReadableArgs<Arc<K>> for LdkLiteEventQueue<K> {
 	}
 }
 
-struct EventQueueSerWrapper(VecDeque<LdkLiteEvent>);
+struct EventQueueSerWrapper(VecDeque<Event>);
 
 impl Readable for EventQueueSerWrapper {
 	fn read<R: lightning::io::Read>(
@@ -217,26 +213,25 @@ impl Writeable for EventQueueSerWrapper {
 	}
 }
 
-pub(crate) struct LdkLiteEventHandler {
-	chain_access: Arc<LdkLiteChainAccess<bdk::sled::Tree>>,
-	event_queue: Arc<LdkLiteEventQueue<FilesystemPersister>>,
+pub(crate) struct EventHandler {
+	chain_access: Arc<ChainAccess<bdk::sled::Tree>>,
+	event_queue: Arc<EventQueue<FilesystemPersister>>,
 	channel_manager: Arc<ChannelManager>,
 	network_graph: Arc<NetworkGraph>,
 	keys_manager: Arc<KeysManager>,
 	inbound_payments: Arc<PaymentInfoStorage>,
 	outbound_payments: Arc<PaymentInfoStorage>,
 	logger: Arc<FilesystemLogger>,
-	_config: Arc<LdkLiteConfig>,
+	_config: Arc<Config>,
 }
 
-impl LdkLiteEventHandler {
+impl EventHandler {
 	pub fn new(
-		chain_access: Arc<LdkLiteChainAccess<bdk::sled::Tree>>,
-		event_queue: Arc<LdkLiteEventQueue<FilesystemPersister>>,
-		channel_manager: Arc<ChannelManager>, network_graph: Arc<NetworkGraph>,
-		keys_manager: Arc<KeysManager>, inbound_payments: Arc<PaymentInfoStorage>,
-		outbound_payments: Arc<PaymentInfoStorage>, logger: Arc<FilesystemLogger>,
-		_config: Arc<LdkLiteConfig>,
+		chain_access: Arc<ChainAccess<bdk::sled::Tree>>,
+		event_queue: Arc<EventQueue<FilesystemPersister>>, channel_manager: Arc<ChannelManager>,
+		network_graph: Arc<NetworkGraph>, keys_manager: Arc<KeysManager>,
+		inbound_payments: Arc<PaymentInfoStorage>, outbound_payments: Arc<PaymentInfoStorage>,
+		logger: Arc<FilesystemLogger>, _config: Arc<Config>,
 	) -> Self {
 		Self {
 			event_queue,
@@ -252,7 +247,7 @@ impl LdkLiteEventHandler {
 	}
 }
 
-impl LdkEventHandler for LdkLiteEventHandler {
+impl LdkEventHandler for EventHandler {
 	fn handle_event(&self, event: &LdkEvent) {
 		match event {
 			LdkEvent::FundingGenerationReady {
@@ -299,14 +294,12 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					amount_msat,
 				);
 				let payment_preimage = match purpose {
-					PaymentPurpose::InvoicePayment { payment_preimage, .. } => {
-						*payment_preimage
-					}
+					PaymentPurpose::InvoicePayment { payment_preimage, .. } => *payment_preimage,
 					PaymentPurpose::SpontaneousPayment(preimage) => Some(*preimage),
 				};
 				self.channel_manager.claim_funds(payment_preimage.unwrap());
 				self.event_queue
-					.add_event(LdkLiteEvent::PaymentReceived {
+					.add_event(Event::PaymentReceived {
 						payment_hash: *payment_hash,
 						amount_msat: *amount_msat,
 					})
@@ -320,14 +313,10 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					amount_msat,
 				);
 				let (payment_preimage, payment_secret) = match purpose {
-					PaymentPurpose::InvoicePayment {
-						payment_preimage,
-						payment_secret,
-						..
-					} => (*payment_preimage, Some(*payment_secret)),
-					PaymentPurpose::SpontaneousPayment(preimage) => {
-						(Some(*preimage), None)
+					PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
+						(*payment_preimage, Some(*payment_secret))
 					}
+					PaymentPurpose::SpontaneousPayment(preimage) => (Some(*preimage), None),
 				};
 				let mut payments = self.inbound_payments.lock().unwrap();
 				match payments.entry(*payment_hash) {
@@ -347,12 +336,7 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					}
 				}
 			}
-			LdkEvent::PaymentSent {
-				payment_preimage,
-				payment_hash,
-				fee_paid_msat,
-				..
-			} => {
+			LdkEvent::PaymentSent { payment_preimage, payment_hash, fee_paid_msat, .. } => {
 				let mut payments = self.outbound_payments.lock().unwrap();
 				for (hash, payment) in payments.iter_mut() {
 					if *hash == *payment_hash {
@@ -374,9 +358,7 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					}
 				}
 				self.event_queue
-					.add_event(LdkLiteEvent::PaymentSuccessful {
-						payment_hash: *payment_hash,
-					})
+					.add_event(Event::PaymentSuccessful { payment_hash: *payment_hash })
 					.unwrap();
 			}
 			LdkEvent::PaymentFailed { payment_hash, .. } => {
@@ -392,9 +374,7 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					payment.status = PaymentStatus::Failed;
 				}
 				self.event_queue
-					.add_event(LdkLiteEvent::PaymentFailed {
-						payment_hash: *payment_hash,
-					})
+					.add_event(Event::PaymentFailed { payment_hash: *payment_hash })
 					.unwrap();
 			}
 
@@ -506,9 +486,7 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					reason
 				);
 				self.event_queue
-					.add_event(LdkLiteEvent::ChannelClosed {
-						channel_id: *channel_id,
-					})
+					.add_event(Event::ChannelClosed { channel_id: *channel_id })
 					.unwrap();
 			}
 			LdkEvent::DiscardFunding { .. } => {}
diff --git a/src/io_utils.rs b/src/io_utils.rs
@@ -1,23 +1,16 @@
-use crate::error::LdkLiteError as Error;
-
-use crate::{FilesystemLogger, LdkLiteConfig, NetworkGraph, PeerInfo, Scorer};
+use crate::{Config, Error, FilesystemLogger, NetworkGraph, Scorer};
 
 use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringParameters};
 use lightning::util::ser::ReadableArgs;
 
-use bitcoin::secp256k1::PublicKey;
-
 use rand::{thread_rng, RngCore};
 
-use std::collections::HashMap;
-use std::convert::TryFrom;
 use std::fs;
-use std::io::{BufRead, BufReader, Write};
-use std::net::SocketAddr;
+use std::io::{BufReader, Write};
 use std::path::Path;
 use std::sync::Arc;
 
-pub(crate) fn read_or_generate_seed_file(config: Arc<LdkLiteConfig>) -> [u8; 32] {
+pub(crate) fn read_or_generate_seed_file(config: Arc<Config>) -> [u8; 32] {
 	let keys_seed_path = format!("{}/keys_seed", config.storage_dir_path);
 	let keys_seed = if Path::new(&keys_seed_path).exists() {
 		let seed = fs::read(keys_seed_path.clone()).expect("Failed to read keys seed file");
@@ -40,7 +33,7 @@ pub(crate) fn read_or_generate_seed_file(config: Arc<LdkLiteConfig>) -> [u8; 32]
 }
 
 pub(crate) fn read_network_graph(
-	config: Arc<LdkLiteConfig>, logger: Arc<FilesystemLogger>,
+	config: Arc<Config>, logger: Arc<FilesystemLogger>,
 ) -> Result<NetworkGraph, Error> {
 	let ldk_data_dir = format!("{}/ldk", &config.storage_dir_path.clone());
 	let network_graph_path = format!("{}/network_graph", ldk_data_dir.clone());
@@ -57,7 +50,7 @@ pub(crate) fn read_network_graph(
 }
 
 pub(crate) fn read_scorer(
-	config: Arc<LdkLiteConfig>, network_graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
+	config: Arc<Config>, network_graph: Arc<NetworkGraph>, logger: Arc<FilesystemLogger>,
 ) -> Scorer {
 	let ldk_data_dir = format!("{}/ldk", &config.storage_dir_path.clone());
 	let scorer_path = format!("{}/scorer", ldk_data_dir.clone());
diff --git a/src/lib.rs b/src/lib.rs
diff --git a/src/logger.rs b/src/logger.rs

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-use crate::error::LdkLiteError as Error;`
`2`		`-#[allow(unused_imports)]`
`3`	`1`	`use crate::logger::{`
`4`		`- log_error, log_given_level, log_info, log_internal, log_trace, log_warn, FilesystemLogger,`
`5`		`- Logger,`
	`2`	`+ log_error, log_given_level, log_internal, log_trace, FilesystemLogger, Logger,`
`6`	`3`	`};`
	`4`	`+use crate::Error;`
`7`	`5`
`8`	`6`	`use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};`
`9`	`7`	`use lightning::chain::WatchedOutput;`
`@@ -22,7 +20,7 @@ use std::sync::{Arc, Mutex};`
`22`	`20`	`/// The minimum feerate we are allowed to send, as specify by LDK.`
`23`	`21`	`const MIN_FEERATE: u32 = 253;`
`24`	`22`
`25`		`-pub struct LdkLiteChainAccess<D>`
	`23`	`+pub struct ChainAccess<D>`
`26`	`24`	`where`
`27`	`25`	`D: BatchDatabase,`
`28`	`26`	`{`
`@@ -36,7 +34,7 @@ where`
`36`	`34`	`logger: Arc<FilesystemLogger>,`
`37`	`35`	`}`
`38`	`36`
`39`		`-impl<D> LdkLiteChainAccess<D>`
	`37`	`+impl<D> ChainAccess<D>`
`40`	`38`	`where`
`41`	`39`	`D: BatchDatabase,`
`42`	`40`	`{`
`@@ -275,7 +273,7 @@ where`
`275`	`273`	`}`
`276`	`274`	`}`
`277`	`275`
`278`		`-impl<D> FeeEstimator for LdkLiteChainAccess<D>`
	`276`	`+impl<D> FeeEstimator for ChainAccess<D>`
`279`	`277`	`where`
`280`	`278`	`D: BatchDatabase,`
`281`	`279`	`{`
`@@ -288,7 +286,7 @@ where`
`288`	`286`	`}`
`289`	`287`	`}`
`290`	`288`
`291`		`-impl<D> BroadcasterInterface for LdkLiteChainAccess<D>`
	`289`	`+impl<D> BroadcasterInterface for ChainAccess<D>`
`292`	`290`	`where`
`293`	`291`	`D: BatchDatabase,`
`294`	`292`	`{`
`@@ -303,7 +301,7 @@ where`
`303`	`301`	`}`
`304`	`302`	`}`
`305`	`303`
`306`		`-impl<D> Filter for LdkLiteChainAccess<D>`
	`304`	`+impl<D> Filter for ChainAccess<D>`
`307`	`305`	`where`
`308`	`306`	`D: BatchDatabase,`
`309`	`307`	`{`
`@@ -317,7 +315,7 @@ where`
`317`	`315`	`}`
`318`	`316`	`}`
`319`	`317`
`320`		`-impl<D> GetHeight for LdkLiteChainAccess<D>`
	`318`	`+impl<D> GetHeight for ChainAccess<D>`
`321`	`319`	`where`
`322`	`320`	`D: BatchDatabase,`
`323`	`321`	`{`
`@@ -326,7 +324,7 @@ where`
`326`	`324`	`}`
`327`	`325`	`}`
`328`	`326`
`329`		`-impl<D> GetBlockHash for LdkLiteChainAccess<D>`
	`327`	`+impl<D> GetBlockHash for ChainAccess<D>`
`330`	`328`	`where`
`331`	`329`	`D: BatchDatabase,`
`332`	`330`	`{`
`@@ -335,7 +333,7 @@ where`
`335`	`333`	`}`
`336`	`334`	`}`
`337`	`335`
`338`		`-impl<D> GetTx for LdkLiteChainAccess<D>`
	`336`	`+impl<D> GetTx for ChainAccess<D>`
`339`	`337`	`where`
`340`	`338`	`D: BatchDatabase,`
`341`	`339`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ use std::fmt;`
`3`	`3`
`4`	`4`	`#[derive(Debug)]`
`5`	`5`	`/// An error that possibly needs to be handled by the user.`
`6`		`-pub enum LdkLiteError {`
	`6`	`+pub enum Error {`
`7`	`7`	`/// Returned when trying to start LdkLite while it is already running.`
`8`	`8`	`AlreadyRunning,`
`9`	`9`	`/// Returned when trying to stop LdkLite while it is not running.`
`@@ -36,7 +36,7 @@ pub enum LdkLiteError {`
`36`	`36`	`ChainAccessFailed,`
`37`	`37`	`}`
`38`	`38`
`39`		`-impl fmt::Display for LdkLiteError {`
	`39`	`+impl fmt::Display for Error {`
`40`	`40`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`
`41`	`41`	`match *self {`
`42`	`42`	`Self::AlreadyRunning => write!(f, "LDKLite is already running."),`
`@@ -60,9 +60,9 @@ impl fmt::Display for LdkLiteError {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`-impl std::error::Error for LdkLiteError {}`
	`63`	`+impl std::error::Error for Error {}`
`64`	`64`
`65`		`-impl From<bdk::Error> for LdkLiteError {`
	`65`	`+impl From<bdk::Error> for Error {`
`66`	`66`	`fn from(e: bdk::Error) -> Self {`
`67`	`67`	`match e {`
`68`	`68`	`bdk::Error::Signer(_) => Self::WalletSigningFailed,`
`@@ -71,7 +71,7 @@ impl From<bdk::Error> for LdkLiteError {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`-impl From<esplora::EsploraError> for LdkLiteError {`
	`74`	`+impl From<esplora::EsploraError> for Error {`
`75`	`75`	`fn from(_e: esplora::EsploraError) -> Self {`
`76`	`76`	`Self::ChainAccessFailed`
`77`	`77`	`}`