From f73a2f362e6e35b8459e02b0f8b1f6e13e39433f Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 18 Jul 2018 15:55:59 +0200 Subject: [PATCH] lnd_test: correct that Bob can sweep immediately This commit fixes a flake within the integration tests, where we would mine a set of blocks before checking if Bob's sweep tx was in the mempool. Usually this would pass since the blocks were generated before the tx hit the miner's mempool, but sometimes it was mined and then we would check the mempool. This commit fixes this by correctly waiting immediately for Bob to sweep his funds, as they are not time locked. --- lnd_test.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lnd_test.go b/lnd_test.go index 660d6a687..43d4d45df 100644 --- a/lnd_test.go +++ b/lnd_test.go @@ -8130,21 +8130,17 @@ func testMultiHopRemoteForceCloseOnChainHtlcTimeout(net *lntest.NetworkHarness, t.Fatalf(predErr.Error()) } - // We'll mine csvDelay blocks in order to generate the sweep transaction - // of Bob's funding output. - if _, err := net.Miner.Node.Generate(csvDelay - 1); err != nil { - t.Fatalf("unable to generate blocks: %v", err) - } - - _, err = waitForTxInMempool(net.Miner.Node, 10*time.Second) + // Bob can sweep his output immediately. + _, err = waitForTxInMempool(net.Miner.Node, 20*time.Second) if err != nil { - t.Fatalf("unable to find bob's funding output sweep tx: %v", err) + t.Fatalf("unable to find bob's funding output sweep tx: %v", + err) } // Next, we'll mine enough blocks for the HTLC to expire. At this // point, Bob should hand off the output to his internal utxo nursery, // which will broadcast a sweep transaction. - if _, err := net.Miner.Node.Generate(finalCltvDelta - csvDelay - 1); err != nil { + if _, err := net.Miner.Node.Generate(finalCltvDelta - 1); err != nil { t.Fatalf("unable to generate blocks: %v", err) }