itest: test the suite when sub-servers are disabled

Update the `testDisablingSubServers` test to also test the suite when
the loop, pool and faraday subservers are disabled.

Author: ellemouton

itest/litd_mode_integrated_test.go

@@ -259,6 +259,7 @@ var (
 		allowedThroughLNC: true,
 		grpcWebURI:        "/frdrpc.FaradayServer/RevenueReport",
 		restWebURI:        "/v1/faraday/revenue",
+		canDisable:        true,
 	}, {
 		name:              "looprpc",
 		macaroonFn:        loopMacaroonFn,
@@ -267,6 +268,7 @@ var (
 		allowedThroughLNC: true,
 		grpcWebURI:        "/looprpc.SwapClient/ListSwaps",
 		restWebURI:        "/v1/loop/swaps",
+		canDisable:        true,
 	}, {
 		name:              "poolrpc",
 		macaroonFn:        poolMacaroonFn,
@@ -275,6 +277,7 @@ var (
 		allowedThroughLNC: true,
 		grpcWebURI:        "/poolrpc.Trader/GetInfo",
 		restWebURI:        "/v1/pool/info",
+		canDisable:        true,
 	}, {
 		name:              "taprpc",
 		macaroonFn:        tapMacaroonFn,
@@ -354,6 +357,9 @@ func testDisablingSubServers(ctx context.Context, net *NetworkHarness,
 	err := net.RestartNode(
 		node, nil, []LitArgOption{
 			WithLitArg("taproot-assets-mode", "disable"),
+			WithLitArg("loop-mode", "disable"),
+			WithLitArg("pool-mode", "disable"),
+			WithLitArg("faraday-mode", "disable"),
 		},
 	)
 	require.NoError(t, err)

itest/litd_node.go

@@ -730,42 +730,56 @@ func (hn *HarnessNode) WaitUntilStarted(conn grpc.ClientConnInterface,
 		return err
 	}
 
+	faradayMode, _ := hn.Cfg.ActiveArgs.getArg("faraday-mode")
+	loopMode, _ := hn.Cfg.ActiveArgs.getArg("loop-mode")
+	poolMode, _ := hn.Cfg.ActiveArgs.getArg("pool-mode")
+	tapMode, _ := hn.Cfg.ActiveArgs.getArg("taproot-assets-mode")
+
 	ctxt, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 	return wait.NoError(func() error {
-		faradayClient, err := hn.faradayClient()
-		if err != nil {
-			return err
-		}
+		if faradayMode != terminal.ModeDisable {
+			faradayClient, err := hn.faradayClient()
+			if err != nil {
+				return err
+			}
 
-		_, err = faradayClient.RevenueReport(
-			ctxt, &frdrpc.RevenueReportRequest{},
-		)
-		if err != nil {
-			return err
+			_, err = faradayClient.RevenueReport(
+				ctxt, &frdrpc.RevenueReportRequest{},
+			)
+			if err != nil {
+				return err
+			}
 		}
 
-		loopClient, err := hn.loopClient()
-		if err != nil {
-			return err
-		}
+		if loopMode != terminal.ModeDisable {
+			loopClient, err := hn.loopClient()
+			if err != nil {
+				return err
+			}
 
-		_, err = loopClient.ListSwaps(ctxt, &looprpc.ListSwapsRequest{})
-		if err != nil {
-			return err
+			_, err = loopClient.ListSwaps(
+				ctxt, &looprpc.ListSwapsRequest{},
+			)
+			if err != nil {
+				return err
+			}
 		}
 
-		poolClient, err := hn.poolClient()
-		if err != nil {
-			return err
-		}
+		if poolMode != terminal.ModeDisable {
+			poolClient, err := hn.poolClient()
+			if err != nil {
+				return err
+			}
 
-		_, err = poolClient.GetInfo(ctxt, &poolrpc.GetInfoRequest{})
-		if err != nil {
-			return err
+			_, err = poolClient.GetInfo(
+				ctxt, &poolrpc.GetInfoRequest{},
+			)
+			if err != nil {
+				return err
+			}
 		}
 
-		tapMode, _ := hn.Cfg.ActiveArgs.getArg("taproot-assets-mode")
 		if tapMode != terminal.ModeDisable {
 			tapClient, err := hn.tapClient()
 			if err != nil {