Merge pull request #394 from TheBlueMatt/2019-11-broken-build

Fix broken build

Author: TheBlueMatt

src/ln/channelmanager.rs

@@ -1393,14 +1393,16 @@ impl ChannelManager {
 									match handle_error!(self, err) {
 										Ok(_) => unreachable!(),
 										Err(e) => {
-											if let Some(msgs::ErrorAction::IgnoreError) = e.action {
-											} else {
-												log_error!(self, "Got bad keys: {}!", e.err);
-												let mut channel_state = self.channel_state.lock().unwrap();
-												channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError {
-													node_id: their_node_id,
-													action: e.action,
-												});
+											match e.action {
+												msgs::ErrorAction::IgnoreError => {},
+												_ => {
+													log_error!(self, "Got bad keys: {}!", e.err);
+													let mut channel_state = self.channel_state.lock().unwrap();
+													channel_state.pending_msg_events.push(events::MessageSendEvent::HandleError {
+														node_id: their_node_id,
+														action: e.action,
+													});
+												},
 											}
 											continue;
 										},

src/ln/channelmonitor.rs

@@ -1740,7 +1740,7 @@ impl ChannelMonitor {
 						output: outputs,
 					};
 
-					let mut predicted_weight = spend_tx.get_weight() + Self::get_witnesses_weight(&inputs_desc[..]);
+					let predicted_weight = spend_tx.get_weight() + Self::get_witnesses_weight(&inputs_desc[..]);
 
 					let mut used_feerate;
 					if !subtract_high_prio_fee!(self, fee_estimator, spend_tx.output[0].value, predicted_weight, tx.txid(), used_feerate) {