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.
This commit is contained in:
Conner Fromknecht 2018-07-24 21:22:13 -07:00
parent ee2f2573c1
commit 381579477c
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

View File

@ -8,14 +8,14 @@ import (
"sync" "sync"
"sync/atomic" "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/blockchain"
"github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "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 // SUMMARY OF OUTPUT STATES
@ -962,7 +962,7 @@ func (u *utxoNursery) createSweepTx(kgtnOutputs []kidOutput,
// sweep. // sweep.
case lnwallet.HtlcOfferedTimeoutSecondLevel: case lnwallet.HtlcOfferedTimeoutSecondLevel:
weightEstimate.AddWitnessInput( weightEstimate.AddWitnessInput(
lnwallet.SecondLevelHtlcSuccessWitnessSize, lnwallet.ToLocalTimeoutWitnessSize,
) )
csvOutputs = append(csvOutputs, input) csvOutputs = append(csvOutputs, input)
@ -971,7 +971,7 @@ func (u *utxoNursery) createSweepTx(kgtnOutputs []kidOutput,
// sweep. // sweep.
case lnwallet.HtlcAcceptedSuccessSecondLevel: case lnwallet.HtlcAcceptedSuccessSecondLevel:
weightEstimate.AddWitnessInput( weightEstimate.AddWitnessInput(
lnwallet.SecondLevelHtlcSuccessWitnessSize, lnwallet.ToLocalTimeoutWitnessSize,
) )
csvOutputs = append(csvOutputs, input) csvOutputs = append(csvOutputs, input)