X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-net-tokio%2Fsrc%2Flib.rs;h=62c036b9796c96f2f812e8eb162835ca9ffd57ba;hb=607cd2e81b6ed6e561673bebb6804068eabb926b;hp=25c161d2aeb07f8ba5305956e93c9299aca303f1;hpb=45853b3a956f83569dff1010a43a33c57487698a;p=rust-lightning

diff --git a/lightning-net-tokio/src/lib.rs b/lightning-net-tokio/src/lib.rs
index 25c161d2..62c036b9 100644
--- a/lightning-net-tokio/src/lib.rs
+++ b/lightning-net-tokio/src/lib.rs
@@ -34,7 +34,7 @@
 //! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
 //! type ChainAccess = dyn lightning::chain::Access + Send + Sync;
 //! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
-//! type DataPersister = dyn lightning::chain::channelmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
+//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
 //! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
 //! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
 //! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, ChainAccess, Logger>>;
@@ -43,13 +43,12 @@
 //! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
 //! 	lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
 //! 	loop {
-//! 		channel_manager.await_persistable_update();
-//! 		channel_manager.process_pending_events(&|event| {
-//! 			// Handle the event!
-//! 		});
-//! 		chain_monitor.process_pending_events(&|event| {
+//! 		let event_handler = |event: &Event| {
 //! 			// Handle the event!
-//! 		});
+//! 		};
+//! 		channel_manager.await_persistable_update();
+//! 		channel_manager.process_pending_events(&event_handler);
+//! 		chain_monitor.process_pending_events(&event_handler);
 //! 	}
 //! }
 //!
@@ -57,13 +56,12 @@
 //! async fn accept_socket(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, socket: TcpStream) {
 //! 	lightning_net_tokio::setup_inbound(peer_manager, socket);
 //! 	loop {
-//! 		channel_manager.await_persistable_update();
-//! 		channel_manager.process_pending_events(&|event| {
-//! 			// Handle the event!
-//! 		});
-//! 		chain_monitor.process_pending_events(&|event| {
+//! 		let event_handler = |event: &Event| {
 //! 			// Handle the event!
-//! 		});
+//! 		};
+//! 		channel_manager.await_persistable_update();
+//! 		channel_manager.process_pending_events(&event_handler);
+//! 		chain_monitor.process_pending_events(&event_handler);
 //! 	}
 //! }
 //! ```
@@ -494,7 +492,6 @@ mod tests {
 		fn handle_node_announcement(&self, _msg: &NodeAnnouncement) -> Result<bool, LightningError> { Ok(false) }
 		fn handle_channel_announcement(&self, _msg: &ChannelAnnouncement) -> Result<bool, LightningError> { Ok(false) }
 		fn handle_channel_update(&self, _msg: &ChannelUpdate) -> Result<bool, LightningError> { Ok(false) }
-		fn handle_htlc_fail_channel_update(&self, _update: &HTLCFailChannelUpdate) { }
 		fn get_next_channel_announcements(&self, _starting_point: u64, _batch_amount: u8) -> Vec<(ChannelAnnouncement, Option<ChannelUpdate>, Option<ChannelUpdate>)> { Vec::new() }
 		fn get_next_node_announcements(&self, _starting_point: Option<&PublicKey>, _batch_amount: u8) -> Vec<NodeAnnouncement> { Vec::new() }
 		fn sync_routing_table(&self, _their_node_id: &PublicKey, _init_msg: &Init) { }