lnwallet/channel: use exposed CommitScriptUnencumbered

This commit is contained in:
Conner Fromknecht 2018-07-11 15:04:50 -07:00 committed by Conner Fromknecht
parent 1eba460a2c
commit b0379dfa59
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7

View File

@ -1953,7 +1953,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
if err != nil { if err != nil {
return nil, err return nil, err
} }
localPkScript, err := commitScriptUnencumbered(keyRing.NoDelayKey) localPkScript, err := CommitScriptUnencumbered(keyRing.NoDelayKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -4889,7 +4889,7 @@ func NewUnilateralCloseSummary(chanState *channeldb.OpenChannel, signer Signer,
// Before we can generate the proper sign descriptor, we'll need to // Before we can generate the proper sign descriptor, we'll need to
// locate the output index of our non-delayed output on the commitment // locate the output index of our non-delayed output on the commitment
// transaction. // transaction.
selfP2WKH, err := commitScriptUnencumbered(keyRing.NoDelayKey) selfP2WKH, err := CommitScriptUnencumbered(keyRing.NoDelayKey)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to create self commit script: %v", err) return nil, fmt.Errorf("unable to create self commit script: %v", err)
} }
@ -5906,7 +5906,7 @@ func CreateCommitTx(fundingOutput wire.TxIn,
// Next, we create the script paying to them. This is just a regular // Next, we create the script paying to them. This is just a regular
// P2WPKH output, without any added CSV delay. // P2WPKH output, without any added CSV delay.
theirWitnessKeyHash, err := commitScriptUnencumbered(keyRing.NoDelayKey) theirWitnessKeyHash, err := CommitScriptUnencumbered(keyRing.NoDelayKey)
if err != nil { if err != nil {
return nil, err return nil, err
} }