highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-08 05:08:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

contractcourt: use MarkChannelResolved for coop channel closures

Browse Source 
In this commit, we alter cooperative channel closures to also use
MarkChannelResolved in order to unify the logic for the different types
of channel closures.
This commit is contained in:
Wilmer Paulino
2018-06-15 12:31:00 -07:00
parent 4578eec8a1
commit d26050f711
3 changed files with 7 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contractcourt/chain_watcher.go
View File

@@ -78,13 +78,6 @@ type chainWatcherConfig struct {
// machine.
signer lnwallet.Signer
// notifyChanClosed is a method that will be called by the watcher when
// it has detected a close on-chain and performed all necessary
// actions, like marking the channel closed in the database and
// notified all its subcribers. It lets the chain arbitrator know that
// the chain watcher chan be stopped.
notifyChanClosed func() error
// contractBreach is a method that will be called by the watcher if it
// detects that a contract breach transaction has been confirmed. Only
// when this method returns with a non-nil error it will be safe to mark
@@ -492,16 +485,7 @@ func (c *chainWatcher) dispatchCooperativeClose(commitSpend *chainntnfs.SpendDet
}
c.Unlock()
// Now notify the ChainArbitrator that the watcher's job is done, such
// that it can shut it down and clean up.
if err := c.cfg.notifyChanClosed(); err != nil {
log.Errorf("unable to notify channel closed for "+
"ChannelPoint(%v): %v",
c.cfg.chanState.FundingOutpoint, err)
}
return nil
}
// dispatchLocalForceClose processes a unilateral close by us being confirmed.