Move the channel_announcement process log into NetworkGraph

This ensures its always written after we update the graph, no
matter how we updated the graph.

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -361,7 +361,6 @@ where C::Target: ChainAccess, L::Target: Logger
 
 	fn handle_channel_announcement(&self, msg: &msgs::ChannelAnnouncement) -> Result<bool, LightningError> {
 		self.network_graph.update_channel_from_announcement(msg, &self.chain_access)?;
-		log_gossip!(self.logger, "Added channel_announcement for {}{}", msg.contents.short_channel_id, if !msg.contents.excess_data.is_empty() { " with excess uninterpreted data!" } else { "" });
 		Ok(msg.contents.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY)
 	}
 
@@ -1542,7 +1541,10 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 			announcement_received_time,
 		};
 
-		self.add_channel_between_nodes(msg.short_channel_id, chan_info, utxo_value)
+		self.add_channel_between_nodes(msg.short_channel_id, chan_info, utxo_value)?;
+
+		log_gossip!(self.logger, "Added channel_announcement for {}{}", msg.short_channel_id, if !msg.excess_data.is_empty() { " with excess uninterpreted data!" } else { "" });
+		Ok(())
 	}
 
 	/// Marks a channel in the graph as failed if a corresponding HTLC fail was sent.