f - Remove $height from wait_threshold_conf!

Author: jkczyz

lightning/src/chain/channelmonitor.rs

@@ -1876,9 +1876,9 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 		let mut watch_outputs = Vec::new();
 
 		macro_rules! wait_threshold_conf {
-			($height: expr, $source: expr, $commitment_tx: expr, $payment_hash: expr) => {
+			($source: expr, $commitment_tx: expr, $payment_hash: expr) => {
 				self.onchain_events_waiting_threshold_conf.retain(|ref entry| {
-					if entry.height != $height { return true; }
+					if entry.height != height { return true; }
 					match entry.event {
 						 OnchainEvent::HTLCUpdate { ref htlc_update } => {
 							 htlc_update.0 != $source
@@ -1927,7 +1927,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 				for &(ref htlc, _, ref source) in &$holder_tx.htlc_outputs {
 					if htlc.transaction_output_index.is_none() {
 						if let &Some(ref source) = source {
-							wait_threshold_conf!(height, source.clone(), "lastest", htlc.payment_hash.clone());
+							wait_threshold_conf!(source.clone(), "lastest", htlc.payment_hash.clone());
 						}
 					}
 				}