f Move types to dedicated file

Author: tnull

src/lib.rs

@@ -30,25 +30,29 @@ mod hex_utils;
 mod io_utils;
 mod logger;
 mod peer_store;
+mod types;
 mod wallet;
 
 pub use error::Error;
 pub use event::Event;
 use event::{EventHandler, EventQueue};
 use peer_store::{PeerInfo, PeerInfoStorage};
-use wallet::{Wallet, WalletKeysManager};
+use types::{
+	ChainMonitor, ChannelManager, GossipSync, InvoicePayer, KeysManager, NetworkGraph,
+	OnionMessenger, PaymentInfoStorage, PeerManager, Router, Scorer,
+};
+pub use types::{PaymentInfo, PaymentStatus};
+use wallet::Wallet;
 
 use logger::{log_error, log_given_level, log_info, log_internal, FilesystemLogger, Logger};
 
-use lightning::chain::keysinterface::{EntropySource, InMemorySigner, NodeSigner, Recipient};
+use lightning::chain::keysinterface::{EntropySource, NodeSigner, Recipient};
 use lightning::chain::{chainmonitor, Access, BestBlock, Confirm, Watch};
 use lightning::ln::channelmanager;
 use lightning::ln::channelmanager::{ChainParameters, ChannelManagerReadArgs};
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
-use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
-use lightning::routing::gossip;
+use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::routing::gossip::P2PGossipSync;
-use lightning::routing::scoring::ProbabilisticScorer;
 
 use lightning::util::config::{ChannelHandshakeConfig, ChannelHandshakeLimits, UserConfig};
 use lightning::util::ser::ReadableArgs;
@@ -59,8 +63,6 @@ use lightning_persister::FilesystemPersister;
 
 use lightning_transaction_sync::EsploraSyncClient;
 
-use lightning_net_tokio::SocketDescriptor;
-
 use lightning::routing::router::DefaultRouter;
 use lightning_invoice::{payment, Currency, Invoice};
 
@@ -1039,82 +1041,3 @@ async fn do_connect_peer(
 		}
 	}
 }
-
-//
-// Structs wrapping the particular information which should easily be
-// understandable, parseable, and transformable, i.e., we'll try to avoid
-// exposing too many technical detail here.
-/// Represents a payment.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct PaymentInfo {
-	/// The pre-image used by the payment.
-	pub preimage: Option<PaymentPreimage>,
-	/// The secret used by the payment.
-	pub secret: Option<PaymentSecret>,
-	/// The status of the payment.
-	pub status: PaymentStatus,
-	/// The amount transferred.
-	pub amount_msat: Option<u64>,
-}
-
-/// Represents the current status of a payment.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum PaymentStatus {
-	/// The payment is still pending.
-	Pending,
-	/// The payment suceeded.
-	Succeeded,
-	/// The payment failed.
-	Failed,
-}
-
-type ChainMonitor = chainmonitor::ChainMonitor<
-	InMemorySigner,
-	Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<FilesystemLogger>,
-	Arc<FilesystemPersister>,
->;
-
-pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
-	SocketDescriptor,
-	Arc<ChannelManager>,
-	Arc<GossipSync>,
-	Arc<OnionMessenger>,
-	Arc<FilesystemLogger>,
-	IgnoringMessageHandler,
->;
-
-pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
-	Arc<ChainMonitor>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<Router>,
-	Arc<FilesystemLogger>,
->;
-
-pub(crate) type KeysManager = WalletKeysManager<bdk::sled::Tree>;
-
-type InvoicePayer<F> =
-	payment::InvoicePayer<Arc<ChannelManager>, Arc<Router>, Arc<FilesystemLogger>, F>;
-
-type Router = DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
-type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
-
-type GossipSync =
-	P2PGossipSync<Arc<NetworkGraph>, Arc<dyn Access + Send + Sync>, Arc<FilesystemLogger>>;
-
-pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
-
-pub(crate) type PaymentInfoStorage = Mutex<HashMap<PaymentHash, PaymentInfo>>;
-
-pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<FilesystemLogger>,
-	IgnoringMessageHandler,
->;

src/types.rs

@@ -0,0 +1,97 @@
+use crate::logger::FilesystemLogger;
+use crate::wallet::{Wallet, WalletKeysManager};
+
+use lightning::chain::keysinterface::InMemorySigner;
+use lightning::chain::{chainmonitor, Access};
+use lightning::ln::peer_handler::IgnoringMessageHandler;
+use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning::routing::gossip;
+use lightning::routing::gossip::P2PGossipSync;
+use lightning::routing::router::DefaultRouter;
+use lightning::routing::scoring::ProbabilisticScorer;
+use lightning_invoice::payment;
+use lightning_net_tokio::SocketDescriptor;
+use lightning_persister::FilesystemPersister;
+use lightning_transaction_sync::EsploraSyncClient;
+
+use std::collections::HashMap;
+use std::sync::{Arc, Mutex};
+
+// Structs wrapping the particular information which should easily be
+// understandable, parseable, and transformable, i.e., we'll try to avoid
+// exposing too many technical detail here.
+/// Represents a payment.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct PaymentInfo {
+	/// The pre-image used by the payment.
+	pub preimage: Option<PaymentPreimage>,
+	/// The secret used by the payment.
+	pub secret: Option<PaymentSecret>,
+	/// The status of the payment.
+	pub status: PaymentStatus,
+	/// The amount transferred.
+	pub amount_msat: Option<u64>,
+}
+
+/// Represents the current status of a payment.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum PaymentStatus {
+	/// The payment is still pending.
+	Pending,
+	/// The payment suceeded.
+	Succeeded,
+	/// The payment failed.
+	Failed,
+}
+
+pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
+	InMemorySigner,
+	Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
+	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<FilesystemLogger>,
+	Arc<FilesystemPersister>,
+>;
+
+pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
+	SocketDescriptor,
+	Arc<ChannelManager>,
+	Arc<GossipSync>,
+	Arc<OnionMessenger>,
+	Arc<FilesystemLogger>,
+	IgnoringMessageHandler,
+>;
+
+pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
+	Arc<ChainMonitor>,
+	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<Router>,
+	Arc<FilesystemLogger>,
+>;
+
+pub(crate) type KeysManager = WalletKeysManager<bdk::sled::Tree>;
+
+pub(crate) type InvoicePayer<F> =
+	payment::InvoicePayer<Arc<ChannelManager>, Arc<Router>, Arc<FilesystemLogger>, F>;
+
+pub(crate) type Router =
+	DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
+pub(crate) type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
+
+pub(crate) type GossipSync =
+	P2PGossipSync<Arc<NetworkGraph>, Arc<dyn Access + Send + Sync>, Arc<FilesystemLogger>>;
+
+pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
+
+pub(crate) type PaymentInfoStorage = Mutex<HashMap<PaymentHash, PaymentInfo>>;
+
+pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<FilesystemLogger>,
+	IgnoringMessageHandler,
+>;