- Err(e) => {
- if let &Some(msgs::ErrorAction::DisconnectPeer{msg: Some(_)}) = &e.action {
- return Err(ChannelError::Close(e.err));
- } else if let &Some(msgs::ErrorAction::SendErrorMessage{msg: _}) = &e.action {
- return Err(ChannelError::Close(e.err));
- } else {
- panic!("Got non-channel-failing result from free_holding_cell_htlcs");
- }
- },
- Ok(Some((commitment_update, channel_monitor))) => return Ok((resend_funding_locked, required_revoke, Some(commitment_update), Some(channel_monitor), order)),
- Ok(None) => return Ok((resend_funding_locked, required_revoke, None, None, order)),
+ Err(ChannelError::Close(msg)) => return Err(ChannelError::Close(msg)),
+ Err(ChannelError::Ignore(_)) => panic!("Got non-channel-failing result from free_holding_cell_htlcs"),
+ Ok(Some((commitment_update, channel_monitor))) => return Ok((resend_funding_locked, required_revoke, Some(commitment_update), Some(channel_monitor), order, shutdown_msg)),
+ Ok(None) => return Ok((resend_funding_locked, required_revoke, None, None, order, shutdown_msg)),