Skip to content

Commit afb6011

Browse files
committed
Drop now-unused ClaimFundsFromHop enum and replace with an Err
1 parent a506e9c commit afb6011

File tree

1 file changed

+14
-38
lines changed

1 file changed

+14
-38
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,6 @@ struct ReceiveError {
303303
msg: &'static str,
304304
}
305305

306-
/// Return value for claim_funds_from_hop
307-
enum ClaimFundsFromHop {
308-
PrevHopForceClosed,
309-
MonitorUpdateFail(PublicKey, MsgHandleErrInternal, Option<u64>),
310-
Success(u64),
311-
DuplicateClaim,
312-
}
313-
314306
type ShutdownResult = (Option<(OutPoint, ChannelMonitorUpdate)>, Vec<(HTLCSource, PaymentHash, PublicKey, [u8; 32])>);
315307

316308
/// Error type returned across the channel_state mutex boundary. When an Err is generated for a
@@ -4349,30 +4341,15 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
43494341
if valid_mpp {
43504342
for htlc in sources.drain(..) {
43514343
if channel_state.is_none() { channel_state = Some(self.channel_state.lock().unwrap()); }
4352-
match self.claim_funds_from_hop(channel_state.take().unwrap(), htlc.prev_hop,
4344+
if let Err((pk, err)) = self.claim_funds_from_hop(channel_state.take().unwrap(), htlc.prev_hop,
43534345
payment_preimage,
43544346
|_| Some(MonitorUpdateCompletionAction::PaymentClaimed { payment_hash }))
43554347
{
4356-
ClaimFundsFromHop::MonitorUpdateFail(pk, err, _) => {
4357-
if let msgs::ErrorAction::IgnoreError = err.err.action {
4358-
// We got a temporary failure updating monitor, but will claim the
4359-
// HTLC when the monitor updating is restored (or on chain).
4360-
log_error!(self.logger, "Temporary failure claiming HTLC, treating as success: {}", err.err.err);
4361-
} else { errs.push((pk, err)); }
4362-
},
4363-
ClaimFundsFromHop::PrevHopForceClosed => {
4364-
// This should be incredibly rare - we checked that all the channels were
4365-
// open above, though as we release the lock at each loop iteration it's
4366-
// still possible. We should still claim the HTLC on-chain through the
4367-
// closed-channel-update generated in claim_funds_from_hop.
4368-
},
4369-
ClaimFundsFromHop::DuplicateClaim => {
4370-
// While we should never get here in most cases, if we do, it likely
4371-
// indicates that the HTLC was timed out some time ago and is no longer
4372-
// available to be claimed. Thus, it does not make sense to set
4373-
// `claimed_any_htlcs`.
4374-
},
4375-
ClaimFundsFromHop::Success(_) => {},
4348+
if let msgs::ErrorAction::IgnoreError = err.err.action {
4349+
// We got a temporary failure updating monitor, but will claim the
4350+
// HTLC when the monitor updating is restored (or on chain).
4351+
log_error!(self.logger, "Temporary failure claiming HTLC, treating as success: {}", err.err.err);
4352+
} else { errs.push((pk, err)); }
43764353
}
43774354
}
43784355
}
@@ -4398,7 +4375,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
43984375
fn claim_funds_from_hop<ComplFunc: FnOnce(Option<u64>) -> Option<MonitorUpdateCompletionAction>>(&self,
43994376
mut channel_state_lock: MutexGuard<ChannelHolder<<K::Target as KeysInterface>::Signer>>,
44004377
prev_hop: HTLCPreviousHopData, payment_preimage: PaymentPreimage, completion_action: ComplFunc)
4401-
-> ClaimFundsFromHop {
4378+
-> Result<(), (PublicKey, MsgHandleErrInternal)> {
44024379
//TODO: Delay the claimed_funds relaying just like we do outbound relay!
44034380

44044381
let chan_id = prev_hop.outpoint.to_channel_id();
@@ -4414,11 +4391,10 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
44144391
"Failed to update channel monitor with preimage {:?}: {:?}",
44154392
payment_preimage, e);
44164393
self.handle_monitor_update_completion_actions(completion_action(Some(htlc_value_msat)));
4417-
return ClaimFundsFromHop::MonitorUpdateFail(
4394+
return Err((
44184395
chan.get().get_counterparty_node_id(),
44194396
handle_monitor_update_res!(self, e, chan, RAACommitmentOrder::CommitmentFirst, false, msgs.is_some()).unwrap_err(),
4420-
Some(htlc_value_msat)
4421-
);
4397+
));
44224398
}
44234399
}
44244400
if let Some((msg, commitment_signed)) = msgs {
@@ -4437,9 +4413,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
44374413
});
44384414
}
44394415
self.handle_monitor_update_completion_actions(completion_action(Some(htlc_value_msat)));
4440-
return ClaimFundsFromHop::Success(htlc_value_msat);
4416+
Ok(())
44414417
} else {
4442-
return ClaimFundsFromHop::DuplicateClaim;
4418+
Ok(())
44434419
}
44444420
},
44454421
Err((e, monitor_update)) => {
@@ -4457,7 +4433,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
44574433
chan.remove_entry();
44584434
}
44594435
self.handle_monitor_update_completion_actions(completion_action(None));
4460-
return ClaimFundsFromHop::MonitorUpdateFail(counterparty_node_id, res, None);
4436+
Err((counterparty_node_id, res))
44614437
},
44624438
}
44634439
} else {
@@ -4484,7 +4460,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
44844460
// generally always allowed to be duplicative (and it's specifically noted in
44854461
// `PaymentForwarded`)..
44864462
self.handle_monitor_update_completion_actions(completion_action(None));
4487-
return ClaimFundsFromHop::PrevHopForceClosed
4463+
Ok(())
44884464
}
44894465
}
44904466

@@ -4576,7 +4552,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
45764552
}})
45774553
} else { None }
45784554
});
4579-
if let ClaimFundsFromHop::MonitorUpdateFail(pk, err, _) = res {
4555+
if let Err((pk, err)) = res {
45804556
let result: Result<(), _> = Err(err);
45814557
let _ = handle_error!(self, result, pk);
45824558
}

0 commit comments

Comments
 (0)