f as_ref, i guess

Author: TheBlueMatt

lightning-background-processor/src/lib.rs

@@ -296,7 +296,7 @@ macro_rules! define_run_body {
 			// ChannelManager, we want to minimize methods blocking on a ChannelManager
 			// generally, and as a fallback place such blocking only immediately before
 			// persistence.
-			$peer_manager.pm().process_events();
+			$peer_manager.as_ref().process_events();
 
 			// Exit the loop if the background processor was requested to stop.
 			if $loop_exit_check {
@@ -341,11 +341,11 @@ macro_rules! define_run_body {
 				// more than a handful of seconds to complete, and shouldn't disconnect all our
 				// peers.
 				log_trace!($logger, "100ms sleep took more than a second, disconnecting peers.");
-				$peer_manager.pm().disconnect_all_peers();
+				$peer_manager.as_ref().disconnect_all_peers();
 				last_ping_call = $get_timer(PING_TIMER);
 			} else if $timer_elapsed(&mut last_ping_call, PING_TIMER) {
 				log_trace!($logger, "Calling PeerManager's timer_tick_occurred");
-				$peer_manager.pm().timer_tick_occurred();
+				$peer_manager.as_ref().timer_tick_occurred();
 				last_ping_call = $get_timer(PING_TIMER);
 			}
 

lightning-net-tokio/src/lib.rs

@@ -86,7 +86,7 @@ impl Connection {
 			if event_receiver.recv().await.is_none() {
 				return;
 			}
-			peer_manager.pm().process_events();
+			peer_manager.as_ref().process_events();
 		}
 	}
 
@@ -130,15 +130,15 @@ impl Connection {
 			tokio::select! {
 				v = write_avail_receiver.recv() => {
 					assert!(v.is_some()); // We can't have dropped the sending end, its in the us Arc!
-					if peer_manager.pm().write_buffer_space_avail(&mut our_descriptor).is_err() {
+					if peer_manager.as_ref().write_buffer_space_avail(&mut our_descriptor).is_err() {
 						break Disconnect::CloseConnection;
 					}
 				},
 				_ = read_wake_receiver.recv() => {},
 				read = reader.read(&mut buf), if !read_paused => match read {
 					Ok(0) => break Disconnect::PeerDisconnected,
 					Ok(len) => {
-						let read_res = peer_manager.pm().read_event(&mut our_descriptor, &buf[0..len]);
+						let read_res = peer_manager.as_ref().read_event(&mut our_descriptor, &buf[0..len]);
 						let mut us_lock = us.lock().unwrap();
 						match read_res {
 							Ok(pause_read) => {
@@ -167,8 +167,8 @@ impl Connection {
 			let _ = writer.shutdown().await;
 		}
 		if let Disconnect::PeerDisconnected = disconnect_type {
-			peer_manager.pm().socket_disconnected(&our_descriptor);
-			peer_manager.pm().process_events();
+			peer_manager.as_ref().socket_disconnected(&our_descriptor);
+			peer_manager.as_ref().process_events();
 		}
 	}
 
@@ -225,7 +225,7 @@ where PM::Target: APeerManager<Descriptor = SocketDescriptor> {
 	#[cfg(test)]
 	let last_us = Arc::clone(&us);
 
-	let handle_opt = if peer_manager.pm().new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr).is_ok() {
+	let handle_opt = if peer_manager.as_ref().new_inbound_connection(SocketDescriptor::new(us.clone()), remote_addr).is_ok() {
 		Some(tokio::spawn(Connection::schedule_read(peer_manager, us, reader, read_receiver, write_receiver)))
 	} else {
 		// Note that we will skip socket_disconnected here, in accordance with the PeerManager
@@ -267,7 +267,7 @@ where PM::Target: APeerManager<Descriptor = SocketDescriptor> {
 	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
 	#[cfg(test)]
 	let last_us = Arc::clone(&us);
-	let handle_opt = if let Ok(initial_send) = peer_manager.pm().new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
+	let handle_opt = if let Ok(initial_send) = peer_manager.as_ref().new_outbound_connection(their_node_id, SocketDescriptor::new(us.clone()), remote_addr) {
 		Some(tokio::spawn(async move {
 			// We should essentially always have enough room in a TCP socket buffer to send the
 			// initial 10s of bytes. However, tokio running in single-threaded mode will always
@@ -286,7 +286,7 @@ where PM::Target: APeerManager<Descriptor = SocketDescriptor> {
 						},
 						_ => {
 							eprintln!("Failed to write first full message to socket!");
-							peer_manager.pm().socket_disconnected(&SocketDescriptor::new(Arc::clone(&us)));
+							peer_manager.as_ref().socket_disconnected(&SocketDescriptor::new(Arc::clone(&us)));
 							break Err(());
 						}
 					}

lightning/src/ln/peer_handler.rs

@@ -562,7 +562,7 @@ pub trait APeerManager {
 	type NST: NodeSigner + ?Sized;
 	type NS: Deref<Target=Self::NST>;
 	/// Gets a reference to the underlying [`PeerManager`].
-	fn pm(&self) -> &PeerManager<Self::Descriptor, Self::CM, Self::RM, Self::OM, Self::L, Self::CMH, Self::NS>;
+	fn as_ref(&self) -> &PeerManager<Self::Descriptor, Self::CM, Self::RM, Self::OM, Self::L, Self::CMH, Self::NS>;
 }
 
 impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CMH: Deref, NS: Deref>
@@ -587,7 +587,7 @@ APeerManager for PeerManager<Descriptor, CM, RM, OM, L, CMH, NS> where
 	type CMH = CMH;
 	type NST = <NS as Deref>::Target;
 	type NS = NS;
-	fn pm(&self) -> &PeerManager<Descriptor, CM, RM, OM, L, CMH, NS> { self }
+	fn as_ref(&self) -> &PeerManager<Descriptor, CM, RM, OM, L, CMH, NS> { self }
 }
 
 /// A PeerManager manages a set of peers, described by their [`SocketDescriptor`] and marshalls