From 381579477ce0a8fde2e74854c3f570e26680dcb0 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Tue, 24 Jul 2018 21:22:13 -0700 Subject: [PATCH] utxonursery: use symmetric second level htlc witness size This commit switches over the estimates for htlc success/timeout witness sizes to use a symmetric variable, highlighting their equivalence in size. --- utxonursery.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utxonursery.go b/utxonursery.go index ff190fae0..3aac57ed7 100644 --- a/utxonursery.go +++ b/utxonursery.go @@ -8,14 +8,14 @@ import ( "sync" "sync/atomic" - "github.com/davecgh/go-spew/spew" - "github.com/lightningnetwork/lnd/chainntnfs" - "github.com/lightningnetwork/lnd/channeldb" - "github.com/lightningnetwork/lnd/lnwallet" "github.com/btcsuite/btcd/blockchain" "github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcutil" + "github.com/davecgh/go-spew/spew" + "github.com/lightningnetwork/lnd/chainntnfs" + "github.com/lightningnetwork/lnd/channeldb" + "github.com/lightningnetwork/lnd/lnwallet" ) // SUMMARY OF OUTPUT STATES @@ -962,7 +962,7 @@ func (u *utxoNursery) createSweepTx(kgtnOutputs []kidOutput, // sweep. case lnwallet.HtlcOfferedTimeoutSecondLevel: weightEstimate.AddWitnessInput( - lnwallet.SecondLevelHtlcSuccessWitnessSize, + lnwallet.ToLocalTimeoutWitnessSize, ) csvOutputs = append(csvOutputs, input) @@ -971,7 +971,7 @@ func (u *utxoNursery) createSweepTx(kgtnOutputs []kidOutput, // sweep. case lnwallet.HtlcAcceptedSuccessSecondLevel: weightEstimate.AddWitnessInput( - lnwallet.SecondLevelHtlcSuccessWitnessSize, + lnwallet.ToLocalTimeoutWitnessSize, ) csvOutputs = append(csvOutputs, input)