From 9de659ea4f8cd7d00cbb7d97f8a264d417737275 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Tue, 8 Dec 2020 18:54:18 +0100
Subject: [PATCH] itest: use require.Eventually where tick speed matters

To not waste a lot of time with the adjusted longer tick interval, we
use a short interval with require.Eventually where we can save some
time.
---
 lntest/itest/lnd_test.go | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/lntest/itest/lnd_test.go b/lntest/itest/lnd_test.go
index 7cd69448..68845c9f 100644
--- a/lntest/itest/lnd_test.go
+++ b/lntest/itest/lnd_test.go
@@ -7948,18 +7948,12 @@ func testGarbageCollectLinkNodes(net *lntest.NetworkHarness, t *harnessTest) {
 		t.Fatalf("unable to restart carol's node: %v", err)
 	}
 
-	err = wait.Predicate(func() bool {
+	require.Eventually(t.t, func() bool {
 		return isConnected(net.Bob.PubKeyStr)
-	}, defaultTimeout)
-	if err != nil {
-		t.Fatalf("alice did not reconnect to bob")
-	}
-	err = wait.Predicate(func() bool {
+	}, defaultTimeout, 20*time.Millisecond)
+	require.Eventually(t.t, func() bool {
 		return isConnected(carol.PubKeyStr)
-	}, defaultTimeout)
-	if err != nil {
-		t.Fatalf("alice did not reconnect to carol")
-	}
+	}, defaultTimeout, 20*time.Millisecond)
 
 	// We'll also restart Alice to ensure she can reconnect to her peers
 	// with open channels.
@@ -7967,24 +7961,18 @@ func testGarbageCollectLinkNodes(net *lntest.NetworkHarness, t *harnessTest) {
 		t.Fatalf("unable to restart alice's node: %v", err)
 	}
 
-	err = wait.Predicate(func() bool {
+	require.Eventually(t.t, func() bool {
 		return isConnected(net.Bob.PubKeyStr)
-	}, defaultTimeout)
-	if err != nil {
-		t.Fatalf("alice did not reconnect to bob")
-	}
-	err = wait.Predicate(func() bool {
+	}, defaultTimeout, 20*time.Millisecond)
+	require.Eventually(t.t, func() bool {
 		return isConnected(carol.PubKeyStr)
-	}, defaultTimeout)
-	if err != nil {
-		t.Fatalf("alice did not reconnect to carol")
-	}
+	}, defaultTimeout, 20*time.Millisecond)
+	require.Eventually(t.t, func() bool {
+		return isConnected(dave.PubKeyStr)
+	}, defaultTimeout, 20*time.Millisecond)
 	err = wait.Predicate(func() bool {
 		return isConnected(dave.PubKeyStr)
 	}, defaultTimeout)
-	if err != nil {
-		t.Fatalf("alice did not reconnect to dave")
-	}
 
 	// testReconnection is a helper closure that restarts the nodes at both
 	// ends of a channel to ensure they do not reconnect after restarting.