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

chainnotifier: remove error log

Browse Source
This commit is contained in:
ErikEk
2021-08-28 00:07:05 +02:00
parent 93d12cd9fc
commit c68a508535
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/release-notes/release-notes-0.14.0.md
View File

@@ -150,6 +150,8 @@ you.
* [Link channel point logging](https://github.com/lightningnetwork/lnd/pull/5508) * [Link channel point logging](https://github.com/lightningnetwork/lnd/pull/5508)
* [Canceling the chain notifier no longer logs certain errors](https://github.com/lightningnetwork/lnd/pull/5676)
* [Fixed context leak in integration tests, and properly handled context * [Fixed context leak in integration tests, and properly handled context
timeout](https://github.com/lightningnetwork/lnd/pull/5646). timeout](https://github.com/lightningnetwork/lnd/pull/5646).

23
lnrpc/chainrpc/chainnotifier_server.go
View File

@@ -300,7 +300,7 @@ func (s *Server) RegisterConfirmationsNtfn(in *ConfRequest,
} }
// The transaction satisfying the request has been reorged out // The transaction satisfying the request has been reorged out
// of the chain, so we'll send an event describing so. // of the chain, so we'll send an event describing it.
case _, ok := <-confEvent.NegativeConf: case _, ok := <-confEvent.NegativeConf:
if !ok { if !ok {
return chainntnfs.ErrChainNotifierShuttingDown return chainntnfs.ErrChainNotifierShuttingDown
@@ -324,9 +324,12 @@ func (s *Server) RegisterConfirmationsNtfn(in *ConfRequest,
return nil return nil
// The response stream's context for whatever reason has been // The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context // closed. If context is closed by an exceeded deadline we will
// itself to the caller. // return an error.
case <-confStream.Context().Done(): case <-confStream.Context().Done():
if errors.Is(confStream.Context().Err(), context.Canceled) {
return nil
}
return confStream.Context().Err() return confStream.Context().Err()
// The server has been requested to shut down. // The server has been requested to shut down.
@@ -432,9 +435,12 @@ func (s *Server) RegisterSpendNtfn(in *SpendRequest,
return nil return nil
// The response stream's context for whatever reason has been // The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context // closed. If context is closed by an exceeded deadline we will
// itself to the caller. // return an error.
case <-spendStream.Context().Done(): case <-spendStream.Context().Done():
if errors.Is(spendStream.Context().Err(), context.Canceled) {
return nil
}
return spendStream.Context().Err() return spendStream.Context().Err()
// The server has been requested to shut down. // The server has been requested to shut down.
@@ -503,9 +509,12 @@ func (s *Server) RegisterBlockEpochNtfn(in *BlockEpoch,
} }
// The response stream's context for whatever reason has been // The response stream's context for whatever reason has been
// closed. We'll return the error indicated by the context // closed. If context is closed by an exceeded deadline we will
// itself to the caller. // return an error.
case <-epochStream.Context().Done(): case <-epochStream.Context().Done():
if errors.Is(epochStream.Context().Err(), context.Canceled) {
return nil
}
return epochStream.Context().Err() return epochStream.Context().Err()
// The server has been requested to shut down. // The server has been requested to shut down.