akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

htlcswitch: switch ackDownStreamPackets order with contract update call

Browse Source 
This commit modifies updateCommitTx to error with ErrLinkShuttingDown
when we try to send a ContractUpdate on the htlcUpdates chan and the
link has closed the quit chan. It also changes the order of the call
to ackDownStreamPackets and contract update call for consistency since
the packets should be acknowledged before the link goes down.
This commit is contained in:
nsa 2020-03-09 13:36:33 -04:00
parent f757bf48bd
commit 4fe174ba4e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htlcswitch/link.go
View File

@ -2060,6 +2060,10 @@ func (l *channelLink) updateCommitTx() error {
return err return err
} }
if err := l.ackDownStreamPackets(); err != nil {
return err
}
// The remote party now has a new pending commitment, so we'll update // The remote party now has a new pending commitment, so we'll update
// the contract court to be aware of this new set (the prior old remote // the contract court to be aware of this new set (the prior old remote
// pending). // pending).
@ -2069,11 +2073,7 @@ func (l *channelLink) updateCommitTx() error {
Htlcs: pendingHTLCs, Htlcs: pendingHTLCs,
}: }:
case <-l.quit: case <-l.quit:
return nil return ErrLinkShuttingDown
}
if err := l.ackDownStreamPackets(); err != nil {
return err
} }
commitSig := &lnwire.CommitSig{ commitSig := &lnwire.CommitSig{