mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-09-12 22:59:38 +02:00
cnct: do not log resolver shutting down as error
This commit is contained in:
@@ -2,7 +2,6 @@ package contractcourt
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"fmt"
|
||||
"io"
|
||||
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
@@ -78,11 +77,11 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
|
||||
select {
|
||||
case _, ok := <-confNtfn.Confirmed:
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
case <-c.Quit:
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
// We're dealing with our commitment transaction if the delay on the
|
||||
@@ -129,7 +128,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
|
||||
log.Infof("ChannelPoint(%v) commit tx is fully resolved by "+
|
||||
"sweep tx: %v", c.chanPoint, sweepResult.Tx.TxHash())
|
||||
case <-c.Quit:
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
c.resolved = true
|
||||
@@ -155,7 +154,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
|
||||
select {
|
||||
case commitSpend, ok := <-spendNtfn.Spend:
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
// Once we detect the commitment output has been spent,
|
||||
@@ -171,7 +170,7 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
|
||||
return nil, err
|
||||
}
|
||||
case <-c.Quit:
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
log.Infof("%T(%v): waiting for commit sweep txid=%v conf", c, c.chanPoint,
|
||||
@@ -190,14 +189,14 @@ func (c *commitSweepResolver) Resolve() (ContractResolver, error) {
|
||||
select {
|
||||
case confInfo, ok := <-confNtfn.Confirmed:
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
log.Infof("ChannelPoint(%v) commit tx is fully resolved, at height: %v",
|
||||
c.chanPoint, confInfo.BlockHeight)
|
||||
|
||||
case <-c.Quit:
|
||||
return nil, fmt.Errorf("quitting")
|
||||
return nil, errResolverShuttingDown
|
||||
}
|
||||
|
||||
// Once the transaction has received a sufficient number of
|
||||
|
Reference in New Issue
Block a user