itest: replace chanOpen bool with chanWatchType

lntest/node.go

@@ -1296,13 +1296,25 @@ func (hn *HarnessNode) kill() error {
 	return hn.cmd.Process.Kill()
 }
 
+type chanWatchType uint8
+
+const (
+	// watchOpenChannel specifies that this is a request to watch an open
+	// channel event.
+	watchOpenChannel chanWatchType = iota
+
+	// watchCloseChannel specifies that this is a request to watch a close
+	// channel event.
+	watchCloseChannel
+)
+
 // closeChanWatchRequest is a request to the lightningNetworkWatcher to be
 // notified once it's detected within the test Lightning Network, that a
 // channel has either been added or closed.
 type chanWatchRequest struct {
 	chanPoint wire.OutPoint
 
-	chanOpen bool
+	chanWatchType chanWatchType
 
 	eventChan chan struct{}
 }
@@ -1387,14 +1399,15 @@ func (hn *HarnessNode) lightningNetworkWatcher() {
 		// to dispatch immediately, or need to add the client for
 		// processing later.
 		case watchRequest := <-hn.chanWatchRequests:
-			// TODO(roasbeef): add update type also, checks for
+			switch watchRequest.chanWatchType {
-			// multiple of 2
+			case watchOpenChannel:
-			if watchRequest.chanOpen {
+				// TODO(roasbeef): add update type also, checks
+				// for multiple of 2
 				hn.handleOpenChannelWatchRequest(watchRequest)
-				continue
-			}
 
+			case watchCloseChannel:
 				hn.handleCloseChannelWatchRequest(watchRequest)
+			}
 
 		case <-hn.quit:
 			return
@@ -1420,7 +1433,7 @@ func (hn *HarnessNode) WaitForNetworkChannelOpen(ctx context.Context,
 	hn.chanWatchRequests <- &chanWatchRequest{
 		chanPoint:     op,
 		eventChan:     eventChan,
-		chanOpen:  true,
+		chanWatchType: watchOpenChannel,
 	}
 
 	select {
@@ -1450,7 +1463,7 @@ func (hn *HarnessNode) WaitForNetworkChannelClose(ctx context.Context,
 	hn.chanWatchRequests <- &chanWatchRequest{
 		chanPoint:     op,
 		eventChan:     eventChan,
-		chanOpen:  false,
+		chanWatchType: watchCloseChannel,
 	}
 
 	select {