highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-07-14 23:22:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

routing: move default cltv assignment out of router

Browse Source 
This commit lifts default setting up to the rpc server level, in line
with other payment defaults.
This commit is contained in:
Joost Jager
2019-04-18 09:45:21 +02:00
parent afd86763ac
commit 19d5f8f82c
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
routing/router.go
View File

@ -1565,10 +1565,8 @@ type LightningPayment struct {
// FinalCLTVDelta is the CTLV expiry delta to use for the _final_ hop
// in the route. This means that the final hop will have a CLTV delta
// of at least: currentHeight + FinalCLTVDelta. If this value is
// unspecified, then a default value of DefaultFinalCLTVDelta will be
// used.
FinalCLTVDelta *uint16
// of at least: currentHeight + FinalCLTVDelta.
FinalCLTVDelta uint16
// PayAttemptTimeout is a timeout value that we'll use to determine
// when we should should abandon the payment attempt after consecutive
@ -1732,13 +1730,6 @@ func (r *ChannelRouter) sendPayment(
return [32]byte{}, nil, err
}
var finalCLTVDelta uint16
if payment.FinalCLTVDelta == nil {
finalCLTVDelta = zpay32.DefaultFinalCLTVDelta
} else {
finalCLTVDelta = *payment.FinalCLTVDelta
}
var payAttemptTimeout time.Duration
if payment.PayAttemptTimeout == time.Duration(0) {
payAttemptTimeout = defaultPayAttemptTimeout
@ -1756,7 +1747,7 @@ func (r *ChannelRouter) sendPayment(
paySession: paySession,
timeoutChan: timeoutChan,
currentHeight: currentHeight,
finalCLTVDelta: finalCLTVDelta,
finalCLTVDelta: uint16(payment.FinalCLTVDelta),
attempt: existingAttempt,
circuit: nil,
lastError: nil,