itest: enhance and adopt itests.

We test that a public zeroconf channel is gossiped through the
network after 6 confirmation.

Moreover itests had to be adopted because we are now sending an
additional ChanUpdate msg for normal public channels signaling
the broadcasting to the broader network.

Author: ziggie1984

itest/lnd_channel_policy_test.go

@@ -69,11 +69,11 @@ func testUpdateChannelPolicy(ht *lntest.HarnessTest) {
 		)
 	}
 
-	// Create Carol with options to rate limit channel updates up to 2 per
+	// Create Carol with options to rate limit channel updates up to 3 per
 	// day, and create a new channel Bob->Carol.
 	carol := ht.NewNode(
 		"Carol", []string{
-			"--gossip.max-channel-update-burst=2",
+			"--gossip.max-channel-update-burst=3",
 			"--gossip.channel-update-interval=24h",
 		},
 	)
@@ -413,13 +413,17 @@ func testUpdateChannelPolicy(ht *lntest.HarnessTest) {
 	req.BaseFeeMsat = baseFee2
 	assertAliceAndBob(req, expectedPolicy)
 
-	// Since Carol didn't receive the last update, she still has Alice's
-	// old policy. We validate this by checking the base fee is the older
-	// one.
-	expectedPolicy.FeeBaseMsat = baseFee1
+	// Because this is not a direct channel we anticipate the new policy.
 	ht.AssertChannelPolicy(
 		carol, alice.PubKeyStr, expectedPolicy, chanPoint,
 	)
+
+	// Since Carol didn't receive the last update, she still has Alice's
+	// old policy. We validate this by checking the base fee is the older
+	// one. This only applies to direct channels because we have an
+	// additional ChanUpdate which is sent after the channel reaches the min
+	// depth of six confirmations.
+	expectedPolicy.FeeBaseMsat = baseFee1
 	ht.AssertChannelPolicy(
 		carol, alice.PubKeyStr, expectedPolicy, chanPoint3,
 	)

lntest/harness.go

@@ -1160,6 +1160,12 @@ func (h *HarnessTest) OpenChannel(alice, bob *node.HarnessNode,
 	// First, open the channel without announcing it.
 	cp := h.OpenChannelNoAnnounce(alice, bob, p)
 
+	// We need to make sure we wait here for 1 second so the ChanUpdate
+	// after 6 confirmations are reached is not considered stale. This
+	// ChanUpdate is important because it unsets the __dont_forward__ bit
+	// signaling the broadcasting to the network.
+	time.Sleep(time.Second)
+
 	// If this is a private channel, there's no need to mine extra blocks
 	// since it will never be announced to the network.
 	if p.Private {
@@ -1850,6 +1856,11 @@ func (h *HarnessTest) OpenMultiChannelsAsync(
 	// Mine one block to confirm all the funding transactions.
 	h.MineBlocksAndAssertNumTxes(1, len(reqs))
 
+	// This sleep is needed otherwise our own ChanUpdate messages might be
+	// considered as stale (same timestamp), failing to deliver a ChanUpdate
+	// to the gossiper with the unset __dont_forward__.
+	time.Sleep(time.Second)
+
 	// Mine 5 more blocks so all the public channels are announced to the
 	// network.
 	h.MineBlocks(numBlocksOpenChannel - 1)