work around rustc 1.34.1

Author: devrandom

lightning/src/ln/channel.rs

@@ -1566,22 +1566,24 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 		// TODO this is not integration tested
 		let counterparty_initial_commitment_tx = counterparty_initial_commitment_info.build(self.counterparty_pubkeys.as_ref().unwrap(), self.holder_keys.pubkeys(), &self.funding_txo.unwrap().into_bitcoin_outpoint(), self.holder_selected_contest_delay, self.is_outbound(), &self.secp_ctx).unwrap().0;
 
-		let holder_keys = self.build_holder_transaction_keys(self.cur_holder_commitment_transaction_number)?;
-		let initial_commitment_info = self.build_commitment_transaction(self.cur_holder_commitment_transaction_number, &holder_keys, true, false, self.feerate_per_kw, logger);
-		let (sighash, initial_commitment_tx) = initial_commitment_info.0.get_sighash(self.holder_keys.pubkeys(), self.counterparty_pubkeys.as_ref().unwrap(), &self.funding_txo.unwrap().into_bitcoin_outpoint(), self.counterparty_selected_contest_delay, self.is_outbound(), &funding_script, self.channel_value_satoshis, &self.secp_ctx);
+		// TODO this works around rustc 1.34.1 borrow issue
+		let channel_monitor = {
+			let holder_keys = self.build_holder_transaction_keys(self.cur_holder_commitment_transaction_number)?;
+			let initial_commitment_info = self.build_commitment_transaction(self.cur_holder_commitment_transaction_number, &holder_keys, true, false, self.feerate_per_kw, logger);
+			let (sighash, initial_commitment_tx) = initial_commitment_info.0.get_sighash(self.holder_keys.pubkeys(), self.counterparty_pubkeys.as_ref().unwrap(), &self.funding_txo.unwrap().into_bitcoin_outpoint(), self.counterparty_selected_contest_delay, self.is_outbound(), &funding_script, self.channel_value_satoshis, &self.secp_ctx);
 
-		let counterparty_funding_pubkey = &self.counterparty_pubkeys.as_ref().unwrap().funding_pubkey;
+			let counterparty_funding_pubkey = &self.counterparty_pubkeys.as_ref().unwrap().funding_pubkey;
 
-		// They sign our commitment transaction, allowing us to broadcast the tx if we wish.
-		if let Err(_) = self.secp_ctx.verify(&sighash, &msg.signature, counterparty_funding_pubkey) {
-			return Err(ChannelError::Close("Invalid funding_signed signature from peer".to_owned()));
-		}
+			// They sign our commitment transaction, allowing us to broadcast the tx if we wish.
+			if let Err(_) = self.secp_ctx.verify(&sighash, &msg.signature, counterparty_funding_pubkey) {
+				return Err(ChannelError::Close("Invalid funding_signed signature from peer".to_owned()));
+			}
 
-		let counterparty_pubkeys = self.counterparty_pubkeys.as_ref().unwrap();
-		let funding_redeemscript = self.get_funding_redeemscript();
-		let funding_txo = self.funding_txo.as_ref().unwrap();
-		let funding_txo_script = funding_redeemscript.to_v0_p2wsh();
-		macro_rules! create_monitor {
+			let counterparty_pubkeys = self.counterparty_pubkeys.as_ref().unwrap();
+			let funding_redeemscript = self.get_funding_redeemscript();
+			let funding_txo = self.funding_txo.as_ref().unwrap();
+			let funding_txo_script = funding_redeemscript.to_v0_p2wsh();
+			macro_rules! create_monitor {
 			() => { {
 				let commitment_tx = HolderCommitmentTransaction::new_missing_holder_sig(initial_commitment_tx.clone(), msg.signature.clone(), &self.holder_keys.pubkeys().funding_pubkey, counterparty_funding_pubkey, holder_keys.clone(), self.feerate_per_kw, Vec::new());
 				let mut channel_monitor = ChannelMonitor::new(self.holder_keys.clone(),
@@ -1598,7 +1600,9 @@ impl<ChanSigner: ChannelKeys> Channel<ChanSigner> {
 			} }
 		}
 
-		let channel_monitor = create_monitor!();
+			let channel_monitor = create_monitor!();
+			channel_monitor
+		};
 
 		assert_eq!(self.channel_state & (ChannelState::MonitorUpdateFailed as u32), 0); // We have no had any monitor(s) yet to fail update!
 		self.channel_state = ChannelState::FundingSent as u32;