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

Merge pull request #5748 from Roasbeef/flake-block-diff

Browse Source 
routing: add wait.NoError to TestBlockDifferenceFix assertion [skip ci]
This commit is contained in:
Oliver Gugger 2021-09-20 08:25:27 +02:00 committed by GitHub
commit d9f0f07142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,7 +313,7 @@ you.
* [Catches up on blocks in the
router](https://github.com/lightningnetwork/lnd/pull/5315) in order to fix an
"out of order" error that crops up.
"out of order" error that [crops up](https://github.com/lightningnetwork/lnd/pull/5748).
* [Fix healthcheck might be running after the max number of attempts are
reached](https://github.com/lightningnetwork/lnd/pull/5686).

18
routing/router_test.go
View File

@ -23,6 +23,7 @@ import (
"github.com/lightningnetwork/lnd/clock"
"github.com/lightningnetwork/lnd/htlcswitch"
lnmock "github.com/lightningnetwork/lnd/lntest/mock"
"github.com/lightningnetwork/lnd/lntest/wait"
"github.com/lightningnetwork/lnd/lntypes"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/record"
@ -4274,6 +4275,7 @@ func TestBlockDifferenceFix(t *testing.T) {
t.Parallel()
initialBlockHeight := uint32(0)
// Starting height here is set to 0, which is behind where we want to be.
ctx, cleanup := createTestCtxSingleNode(t, initialBlockHeight)
defer cleanup()
@ -4330,9 +4332,17 @@ func TestBlockDifferenceFix(t *testing.T) {
<-ctx.chainView.notifyBlockAck
}
// Then router height should be updated to the latest block.
if atomic.LoadUint32(&ctx.router.bestHeight) != newBlockHeight {
t.Fatalf("height should have been updated to %v, instead got "+
"%v", newBlockHeight, ctx.router.bestHeight)
err := wait.NoError(func() error {
// Then router height should be updated to the latest block.
if atomic.LoadUint32(&ctx.router.bestHeight) != newBlockHeight {
return fmt.Errorf("height should have been updated "+
"to %v, instead got %v", newBlockHeight,
ctx.router.bestHeight)
}
return nil
}, testTimeout)
if err != nil {
t.Fatalf("block height wasn't updated: %v", err)
}
}