From: Matt Corallo <git@bluematt.me>
Date: Wed, 5 Sep 2018 00:02:33 +0000 (-0400)
Subject: Fill out IgnoreError actions in get_channel_announcement
X-Git-Tag: v0.0.12~329^2~1
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=7a234b63857297a074f0268f677aaccaac08ade1;p=rust-lightning

Fill out IgnoreError actions in get_channel_announcement

They are all just "its too early/late to get an announcement"
errors so simply ignoring them and not sending an announce is fine
---

diff --git a/src/ln/channel.rs b/src/ln/channel.rs
index e9ba79f0b..14ab80c90 100644
--- a/src/ln/channel.rs
+++ b/src/ln/channel.rs
@@ -2298,13 +2298,13 @@ impl Channel {
 	/// https://github.com/lightningnetwork/lightning-rfc/issues/468
 	pub fn get_channel_announcement(&self, our_node_id: PublicKey, chain_hash: Sha256dHash) -> Result<(msgs::UnsignedChannelAnnouncement, Signature), HandleError> {
 		if !self.announce_publicly {
-			return Err(HandleError{err: "Channel is not available for public announcements", action: None});
+			return Err(HandleError{err: "Channel is not available for public announcements", action: Some(msgs::ErrorAction::IgnoreError)});
 		}
 		if self.channel_state & (ChannelState::ChannelFunded as u32) == 0 {
-			return Err(HandleError{err: "Cannot get a ChannelAnnouncement until the channel funding has been locked", action: None});
+			return Err(HandleError{err: "Cannot get a ChannelAnnouncement until the channel funding has been locked", action: Some(msgs::ErrorAction::IgnoreError)});
 		}
 		if (self.channel_state & (ChannelState::LocalShutdownSent as u32 | ChannelState::ShutdownComplete as u32)) != 0 {
-			return Err(HandleError{err: "Cannot get a ChannelAnnouncement once the channel is closing", action: None});
+			return Err(HandleError{err: "Cannot get a ChannelAnnouncement once the channel is closing", action: Some(msgs::ErrorAction::IgnoreError)});
 		}
 
 		let were_node_one = our_node_id.serialize()[..] < self.their_node_id.serialize()[..];