Clean up types.rs

Author: tnull

src/event.rs

@@ -1,6 +1,5 @@
-use crate::{
-	hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId, Wallet,
-};
+use crate::types::Wallet;
+use crate::{hex_utils, ChannelManager, Config, Error, KeysManager, NetworkGraph, UserChannelId};
 
 use crate::payment_store::{
 	PaymentDetails, PaymentDetailsUpdate, PaymentDirection, PaymentStatus, PaymentStore,
@@ -242,7 +241,7 @@ pub(crate) struct EventHandler<K: KVStore + Sync + Send, L: Deref>
 where
 	L::Target: Logger,
 {
-	wallet: Arc<Wallet<bdk::database::SqliteDatabase, L>>,
+	wallet: Arc<Wallet>,
 	event_queue: Arc<EventQueue<K, L>>,
 	channel_manager: Arc<ChannelManager<K>>,
 	network_graph: Arc<NetworkGraph>,
@@ -258,7 +257,7 @@ where
 	L::Target: Logger,
 {
 	pub fn new(
-		wallet: Arc<Wallet<bdk::database::SqliteDatabase, L>>, event_queue: Arc<EventQueue<K, L>>,
+		wallet: Arc<Wallet>, event_queue: Arc<EventQueue<K, L>>,
 		channel_manager: Arc<ChannelManager<K>>, network_graph: Arc<NetworkGraph>,
 		keys_manager: Arc<KeysManager>, payment_store: Arc<PaymentStore<K, L>>,
 		runtime: Arc<RwLock<Option<tokio::runtime::Runtime>>>, logger: L, config: Arc<Config>,

src/lib.rs

@@ -118,9 +118,10 @@ use gossip::GossipSource;
 use payment_store::PaymentStore;
 pub use payment_store::{PaymentDetails, PaymentDirection, PaymentStatus};
 use peer_store::{PeerInfo, PeerStore};
-use types::{ChainMonitor, ChannelManager, KeysManager, NetworkGraph, PeerManager, Router, Scorer};
+use types::{
+	ChainMonitor, ChannelManager, KeysManager, NetworkGraph, PeerManager, Router, Scorer, Wallet,
+};
 pub use types::{ChannelDetails, PeerDetails, UserChannelId};
-use wallet::Wallet;
 
 use logger::{log_error, log_info, log_trace, FilesystemLogger, Logger};
 
@@ -284,7 +285,7 @@ pub struct Node<K: KVStore + Sync + Send + 'static> {
 	stop_sender: tokio::sync::watch::Sender<()>,
 	stop_receiver: tokio::sync::watch::Receiver<()>,
 	config: Arc<Config>,
-	wallet: Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	wallet: Arc<Wallet>,
 	tx_sync: Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
 	event_queue: Arc<EventQueue<K, Arc<FilesystemLogger>>>,
 	channel_manager: Arc<ChannelManager<K>>,

src/types.rs

@@ -1,5 +1,4 @@
 use crate::logger::FilesystemLogger;
-use crate::wallet::{Wallet, WalletKeysManager};
 
 use lightning::chain::chainmonitor;
 use lightning::ln::channelmanager::ChannelDetails as LdkChannelDetails;
@@ -25,8 +24,8 @@ use std::sync::{Arc, Mutex, RwLock};
 pub(crate) type ChainMonitor<K> = chainmonitor::ChainMonitor<
 	InMemorySigner,
 	Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<Wallet>,
+	Arc<Wallet>,
 	Arc<FilesystemLogger>,
 	Arc<K>,
 >;
@@ -38,22 +37,25 @@ pub(crate) type PeerManager<K> = lightning::ln::peer_handler::PeerManager<
 	Arc<OnionMessenger>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<KeysManager>,
 >;
 
 pub(crate) type ChannelManager<K> = lightning::ln::channelmanager::ChannelManager<
 	Arc<ChainMonitor<K>>,
-	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<Wallet>,
+	Arc<KeysManager>,
+	Arc<KeysManager>,
+	Arc<KeysManager>,
+	Arc<Wallet>,
 	Arc<Router>,
 	Arc<FilesystemLogger>,
 >;
 
+pub(crate) type Wallet =
+	crate::wallet::Wallet<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>;
+
 pub(crate) type KeysManager =
-	WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>;
+	crate::wallet::WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>;
 
 pub(crate) type Router = DefaultRouter<
 	Arc<NetworkGraph>,
@@ -85,8 +87,8 @@ pub(crate) type GossipSync = lightning_background_processor::GossipSync<
 >;
 
 pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
-	Arc<WalletKeysManager<bdk::database::SqliteDatabase, Arc<FilesystemLogger>>>,
+	Arc<KeysManager>,
+	Arc<KeysManager>,
 	Arc<FilesystemLogger>,
 	Arc<FakeMessageRouter>,
 	IgnoringMessageHandler,