return addresses actually used for announcement

Author: aylagreystone

src/lib.rs

@@ -457,10 +457,10 @@ impl Node {
 								continue;
 							}
 
-							let addresses = if let Some(addresses) = bcast_config.announcement_addresses.clone() {
-								addresses
-							} else if let Some(addresses) = bcast_config.listening_addresses.clone() {
-								addresses
+							let addresses = if let Some(announcement_addresses) = bcast_config.announcement_addresses.clone() {
+								announcement_addresses
+							} else if let Some(listening_addresses) = bcast_config.listening_addresses.clone() {
+								listening_addresses
 							} else {
 								debug_assert!(false, "We checked whether the node may announce, so listening addresses should always be set");
 								continue;
@@ -804,9 +804,12 @@ impl Node {
 		self.config.listening_addresses.clone()
 	}
 
-	/// Returns our own announcement addresses.
+	/// Returns the addresses that the node will announce to the network.
 	pub fn announcement_addresses(&self) -> Option<Vec<SocketAddress>> {
-		self.config.announcement_addresses.clone()
+		self.config
+			.announcement_addresses
+			.clone()
+			.or_else(|| self.config.listening_addresses.clone())
 	}
 
 	/// Returns our node alias.