mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-06-14 10:51:52 +02:00
contractcourt: fix rebase issue with removed variadic option
The optional variadic functional parameters probably got lost during a rebase.
This commit is contained in:
parent
b21b1e3acb
commit
0e9b7c5fa2
@ -413,17 +413,22 @@ func (c *commitSweepResolver) Launch() error {
|
|||||||
&c.commitResolution.SelfOutPoint, witnessType,
|
&c.commitResolution.SelfOutPoint, witnessType,
|
||||||
&c.commitResolution.SelfOutputSignDesc,
|
&c.commitResolution.SelfOutputSignDesc,
|
||||||
c.broadcastHeight, c.commitResolution.MaturityDelay,
|
c.broadcastHeight, c.commitResolution.MaturityDelay,
|
||||||
c.leaseExpiry,
|
c.leaseExpiry, input.WithResolutionBlob(
|
||||||
|
c.commitResolution.ResolutionBlob,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
inp = input.NewCsvInput(
|
inp = input.NewCsvInput(
|
||||||
&c.commitResolution.SelfOutPoint, witnessType,
|
&c.commitResolution.SelfOutPoint, witnessType,
|
||||||
&c.commitResolution.SelfOutputSignDesc,
|
&c.commitResolution.SelfOutputSignDesc,
|
||||||
c.broadcastHeight, c.commitResolution.MaturityDelay,
|
c.broadcastHeight, c.commitResolution.MaturityDelay,
|
||||||
|
input.WithResolutionBlob(
|
||||||
|
c.commitResolution.ResolutionBlob,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(roasbeef): instead of ading ctrl block to the sign desc, make
|
// TODO(roasbeef): instead of adding ctrl block to the sign desc, make
|
||||||
// new input type, have sweeper set it?
|
// new input type, have sweeper set it?
|
||||||
|
|
||||||
// Calculate the budget for the sweeping this input.
|
// Calculate the budget for the sweeping this input.
|
||||||
|
@ -58,10 +58,8 @@ func (h *htlcLeaseResolver) makeSweepInput(op *wire.OutPoint,
|
|||||||
|
|
||||||
if h.hasCLTV() {
|
if h.hasCLTV() {
|
||||||
return input.NewCsvInputWithCltv(
|
return input.NewCsvInputWithCltv(
|
||||||
op, cltvWtype, signDesc,
|
op, cltvWtype, signDesc, broadcastHeight, csvDelay,
|
||||||
broadcastHeight, csvDelay,
|
h.leaseExpiry, input.WithResolutionBlob(resBlob),
|
||||||
h.leaseExpiry,
|
|
||||||
input.WithResolutionBlob(resBlob),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user