Merge pull request #9574 from ellemouton/fixWatcherPanic

lntest: wait for ChanUpdate req to be fully processed before sending another

docs/release-notes/release-notes-0.19.0.md

@@ -323,6 +323,9 @@ The underlying functionality between those two options remain the same.
 * Add a new CI-step to do some basic [backwards compatibility 
   testing](https://github.com/lightningnetwork/lnd/pull/9540) for each PR. 
 
+* [Fix](https://github.com/lightningnetwork/lnd/pull/9574) an integration test 
+  flake that could lead to a "close of a closed channel" panic.
+
 ## Database
 
 * [Migrate the mission control 

lntest/node/watcher.go

@@ -45,6 +45,10 @@ type chanWatchRequest struct {
 	advertisingNode    string
 	policy             *lnrpc.RoutingPolicy
 	includeUnannounced bool
+
+	// handled is a channel that will be closed once the request has been
+	// handled by the topologyWatcher goroutine.
+	handled chan struct{}
 }
 
 // nodeWatcher is a topology watcher for a HarnessNode. It keeps track of all
@@ -154,6 +158,7 @@ func (nw *nodeWatcher) WaitForChannelOpen(chanPoint *lnrpc.ChannelPoint) error {
 		chanPoint:     op,
 		eventChan:     eventChan,
 		chanWatchType: watchOpenChannel,
+		handled:       make(chan struct{}),
 	}
 
 	timer := time.After(wait.DefaultTimeout)
@@ -185,6 +190,7 @@ func (nw *nodeWatcher) WaitForChannelClose(
 		chanPoint:     op,
 		eventChan:     eventChan,
 		chanWatchType: watchCloseChannel,
+		handled:       make(chan struct{}),
 	}
 
 	timer := time.After(wait.DefaultTimeout)
@@ -216,7 +222,27 @@ func (nw *nodeWatcher) WaitForChannelPolicyUpdate(
 	timer := time.After(wait.DefaultTimeout)
 	defer ticker.Stop()
 
-	eventChan := make(chan struct{})
+	// onTimeout is a helper function that will be called in case the
+	// expected policy is not found before the timeout.
+	onTimeout := func() error {
+		expected, err := json.MarshalIndent(policy, "", "\t")
+		if err != nil {
+			return fmt.Errorf("encode policy err: %w", err)
+		}
+
+		policies, err := syncMapToJSON(&nw.state.policyUpdates.Map)
+		if err != nil {
+			return err
+		}
+
+		return fmt.Errorf("policy not updated before timeout:"+
+			"\nchannel: %v \nadvertisingNode: %s:%v"+
+			"\nwant policy:%s\nhave updates:%s", op,
+			advertisingNode.Name(), advertisingNode.PubKeyStr,
+			expected, policies)
+	}
+
+	var eventChan = make(chan struct{})
 	for {
 		select {
 		// Send a watch request every second.
@@ -230,6 +256,7 @@ func (nw *nodeWatcher) WaitForChannelPolicyUpdate(
 			default:
 			}
 
+			var handled = make(chan struct{})
 			nw.chanWatchRequests <- &chanWatchRequest{
 				chanPoint:          op,
 				eventChan:          eventChan,
@@ -237,28 +264,25 @@ func (nw *nodeWatcher) WaitForChannelPolicyUpdate(
 				policy:             policy,
 				advertisingNode:    advertisingNode.PubKeyStr,
 				includeUnannounced: includeUnannounced,
+				handled:            handled,
+			}
+
+			// We wait for the topologyWatcher to signal that
+			// it has completed the handling of the request so that
+			// we don't send a new request before the previous one
+			// has been processed as this could lead to a double
+			// closure of the eventChan channel.
+			select {
+			case <-handled:
+			case <-timer:
+				return onTimeout()
 			}
 
 		case <-eventChan:
 			return nil
 
 		case <-timer:
-			expected, err := json.MarshalIndent(policy, "", "\t")
-			if err != nil {
-				return fmt.Errorf("encode policy err: %w", err)
-			}
-			policies, err := syncMapToJSON(
-				&nw.state.policyUpdates.Map,
-			)
-			if err != nil {
-				return err
-			}
-
-			return fmt.Errorf("policy not updated before timeout:"+
-				"\nchannel: %v \nadvertisingNode: %s:%v"+
-				"\nwant policy:%s\nhave updates:%s", op,
-				advertisingNode.Name(),
-				advertisingNode.PubKeyStr, expected, policies)
+			return onTimeout()
 		}
 	}
 }
@@ -341,6 +365,10 @@ func (nw *nodeWatcher) topologyWatcher(ctxb context.Context,
 				nw.handlePolicyUpdateWatchRequest(watchRequest)
 			}
 
+			// Signal to the caller that the request has been
+			// handled.
+			close(watchRequest.handled)
+
 		case <-ctxb.Done():
 			return
 		}