f remove unnecessary clones

Author: arik-so

lightning/src/onion_message/messenger.rs

@@ -386,8 +386,11 @@ where
 			let node_announcement = network_graph
 				.node(&NodeId::from_pubkey(&first_node))
 				.and_then(|node_info| node_info.announcement_info.as_ref())
-				.and_then(|announcement_info| announcement_info.announcement_message().cloned())
-				.map(|node_announcement| node_announcement.contents);
+				.and_then(|announcement_info| {
+					announcement_info
+						.announcement_message()
+						.map(|node_announcement| &node_announcement.contents)
+				});
 
 			match node_announcement {
 				Some(node_announcement) if node_announcement.features.supports_onion_messages() => {

lightning/src/routing/gossip.rs

@@ -1218,13 +1218,13 @@ impl NodeAnnouncementInfo {
 	}
 
 	/// Internet-level addresses via which one can connect to the node
-	pub fn addresses(&self) -> Vec<SocketAddress> {
+	pub fn addresses(&self) -> &Vec<SocketAddress> {
 		match self {
 			NodeAnnouncementInfo::Relayed(relayed) => {
-				relayed.contents.addresses.clone()
+				&relayed.contents.addresses
 			}
 			NodeAnnouncementInfo::Local(local) => {
-				local.addresses.clone()
+				&local.addresses
 			}
 		}
 	}
@@ -1259,7 +1259,7 @@ impl Writeable for NodeAnnouncementInfo {
 			(4, rgb, required),
 			(6, alias, required),
 			(8, announcement_message, option),
-			(10, addresses, required_vec), // Versions prior to 0.0.115 require this field
+			(10, *addresses, required_vec), // Versions prior to 0.0.115 require this field
 		});
 		Ok(())
 	}