fixed refactor bugs in test

Author: SWvheerden

src/ln/channel.rs

@@ -2545,7 +2545,7 @@ impl Channel {
 	/// Note that the "channel must be funded" requirement is stricter than BOLT 7 requires - see
 	/// 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.config.channel_options.force_announced_channel_preference {
+		if !self.config.channel_options.announced_channel {
 			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 {

src/ln/channelmanager.rs

@@ -3011,7 +3011,7 @@ mod tests {
 			let mut config = UserConfigurations::new();
 			config.channel_options.announced_channel = true;
 			config.channel_options.fee_proportional_millionths = 0;
-			config.channel_options.force_announced_channel_preference = true;
+			config.channel_options.force_announced_channel_preference = false;
 			let node = ChannelManager::new(node_id.clone(), Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger), config).unwrap();
 			let router = Router::new(PublicKey::from_secret_key(&secp_ctx, &node_id), chain_monitor.clone(), Arc::clone(&logger));
 			nodes.push(Node { chain_monitor, tx_broadcaster, chan_monitor, node, router,