Take all PublicKey and SocketAddr by value

They are copied/defereneced in most cases anyways, and this makes the
interface a bit more uniform.

Author: tnull

src/lib.rs

@@ -844,8 +844,8 @@ impl Node {
 	}
 
 	/// Returns our own listening address.
-	pub fn listening_address(&self) -> Option<&SocketAddr> {
-		self.config.listening_address.as_ref()
+	pub fn listening_address(&self) -> Option<SocketAddr> {
+		self.config.listening_address
 	}
 
 	/// Retrieve a new on-chain/funding address.
@@ -939,7 +939,7 @@ impl Node {
 	///
 	/// Will also remove the peer from the peer store, i.e., after this has been called we won't
 	/// try to reconnect on restart.
-	pub fn disconnect(&self, counterparty_node_id: &PublicKey) -> Result<(), Error> {
+	pub fn disconnect(&self, counterparty_node_id: PublicKey) -> Result<(), Error> {
 		let rt_lock = self.runtime.read().unwrap();
 		if rt_lock.is_none() {
 			return Err(Error::NotRunning);
@@ -954,7 +954,7 @@ impl Node {
 			}
 		}
 
-		self.peer_manager.disconnect_by_node_id(*counterparty_node_id);
+		self.peer_manager.disconnect_by_node_id(counterparty_node_id);
 		Ok(())
 	}
 
@@ -1112,10 +1112,10 @@ impl Node {
 
 	/// Close a previously opened channel.
 	pub fn close_channel(
-		&self, channel_id: &[u8; 32], counterparty_node_id: &PublicKey,
+		&self, channel_id: &[u8; 32], counterparty_node_id: PublicKey,
 	) -> Result<(), Error> {
-		self.peer_store.remove_peer(counterparty_node_id)?;
-		match self.channel_manager.close_channel(channel_id, counterparty_node_id) {
+		self.peer_store.remove_peer(&counterparty_node_id)?;
+		match self.channel_manager.close_channel(channel_id, &counterparty_node_id) {
 			Ok(_) => Ok(()),
 			Err(_) => Err(Error::ChannelClosingFailed),
 		}
@@ -1277,7 +1277,7 @@ impl Node {
 
 	/// Send a spontaneous, aka. "keysend", payment
 	pub fn send_spontaneous_payment(
-		&self, amount_msat: u64, node_id: &PublicKey,
+		&self, amount_msat: u64, node_id: PublicKey,
 	) -> Result<PaymentHash, Error> {
 		let rt_lock = self.runtime.read().unwrap();
 		if rt_lock.is_none() {
@@ -1289,7 +1289,7 @@ impl Node {
 
 		let route_params = RouteParameters {
 			payment_params: PaymentParameters::from_node_id(
-				*node_id,
+				node_id,
 				self.config.default_cltv_expiry_delta,
 			),
 			final_value_msat: amount_msat,

src/test/functional_tests.rs

@@ -39,7 +39,7 @@ fn channel_full_cycle() {
 	node_a
 		.connect_open_channel(
 			node_b.node_id(),
-			*node_b.listening_address().unwrap(),
+			node_b.listening_address().unwrap(),
 			funding_amount_sat,
 			Some(push_msat),
 			true,
@@ -180,7 +180,7 @@ fn channel_full_cycle() {
 	assert_eq!(node_b.payment(&payment_hash).unwrap().direction, PaymentDirection::Inbound);
 	assert_eq!(node_b.payment(&payment_hash).unwrap().amount_msat, Some(determined_amount_msat));
 
-	node_b.close_channel(&channel_id, &node_a.node_id()).unwrap();
+	node_b.close_channel(&channel_id, node_a.node_id()).unwrap();
 	expect_event!(node_a, ChannelClosed);
 	expect_event!(node_b, ChannelClosed);
 
@@ -240,7 +240,7 @@ fn channel_open_fails_when_funds_insufficient() {
 		Err(Error::InsufficientFunds),
 		node_a.connect_open_channel(
 			node_b.node_id(),
-			*node_b.listening_address().unwrap(),
+			node_b.listening_address().unwrap(),
 			120000,
 			None,
 			true