itest: speed up test by skipping Alice+bob

Author: guggero

itest/litd_custom_channels_test.go

@@ -3948,18 +3948,6 @@ func testCustomChannelsDecodeAssetInvoice(ctx context.Context,
 			"rfqrpc://%s", oracleAddr,
 	))
 
-	// For this test, Zane will be our dedicated Universe server for all
-	// parties.
-	zane, err := net.NewNode(
-		t.t, "Zane", lndArgs, false, true, litdArgs...,
-	)
-	require.NoError(t.t, err)
-
-	litdArgs = append(litdArgs, fmt.Sprintf(
-		"--taproot-assets.proofcourieraddr=%s://%s",
-		proof.UniverseRpcCourierType, zane.Cfg.LitAddr(),
-	))
-
 	// We'll just make a single node here, as this doesn't actually rely on
 	// a set of active channels.
 	alice, err := net.NewNode(

itest/litd_test.go

@@ -1,7 +1,6 @@
 package itest
 
 import (
-	"fmt"
 	"os"
 	"strings"
 	"testing"
@@ -42,8 +41,6 @@ func TestLightningTerminal(t *testing.T) {
 
 	// Run the subset of the test cases selected in this tranche.
 	for _, testCase := range allTestCases {
-		testCase := testCase
-
 		success := t.Run(testCase.name, func(t1 *testing.T) {
 			cleanTestCaseName := strings.ReplaceAll(
 				testCase.name, " ", "_",
@@ -79,24 +76,9 @@ func TestLightningTerminal(t *testing.T) {
 
 			err = litdHarness.SetUp(
 				t1, cleanTestCaseName, aliceBobArgs,
+				testCase.noAliceBob,
 			)
 			require.NoError(t1, err, "harness setup failed")
-			t1.Cleanup(func() {
-				require.NoError(t1, litdHarness.TearDown())
-				litdHarness.Stop()
-			})
-
-			litdHarness.EnsureConnected(
-				t1, litdHarness.Alice, litdHarness.Bob,
-			)
-
-			logLine := fmt.Sprintf(
-				"STARTING ============ %v ============\n",
-				testCase.name,
-			)
-
-			litdHarness.Alice.AddToLog(logLine)
-			litdHarness.Bob.AddToLog(logLine)
 
 			// Create a separate harness test for the testcase to
 			// avoid overwriting the external harness test that is

itest/litd_test_list_on_test.go

@@ -5,83 +5,98 @@ package itest
 
 var allTestCases = []*testCase{
 	{
-		name: "test mode integrated",
+		name: "integrated mode",
 		test: testModeIntegrated,
 	},
 	{
-		name: "test mode remote",
+		name: "remote mode",
 		test: testModeRemote,
 	},
 	{
 		name: "stateless init mode",
 		test: testStatelessInitMode,
 	},
 	{
-		name: "test firewall rules",
+		name: "firewall rules",
 		test: testFirewallRules,
 	},
 	{
-		name: "test large http header",
+		name: "large http header",
 		test: testLargeHttpHeader,
 	},
 	{
-		name: "test custom channels",
-		test: testCustomChannels,
+		name:       "custom channels",
+		test:       testCustomChannels,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels large",
-		test: testCustomChannelsLarge,
+		name:       "custom channels large",
+		test:       testCustomChannelsLarge,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels grouped asset",
-		test: testCustomChannelsGroupedAsset,
+		name:       "custom channels grouped asset",
+		test:       testCustomChannelsGroupedAsset,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels force close",
-		test: testCustomChannelsForceClose,
+		name:       "custom channels force close",
+		test:       testCustomChannelsForceClose,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels breach",
-		test: testCustomChannelsBreach,
+		name:       "custom channels breach",
+		test:       testCustomChannelsBreach,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels liquidity",
-		test: testCustomChannelsLiquidityEdgeCases,
+		name:       "custom channels liquidity",
+		test:       testCustomChannelsLiquidityEdgeCases,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels htlc force close",
-		test: testCustomChannelsHtlcForceClose,
+		name:       "custom channels htlc force close",
+		test:       testCustomChannelsHtlcForceClose,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels htlc force close MPP",
-		test: testCustomChannelsHtlcForceCloseMpp,
+		name:       "custom channels htlc force close MPP",
+		test:       testCustomChannelsHtlcForceCloseMpp,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels balance consistency",
-		test: testCustomChannelsBalanceConsistency,
+		name:       "custom channels balance consistency",
+		test:       testCustomChannelsBalanceConsistency,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels single asset multi input",
-		test: testCustomChannelsSingleAssetMultiInput,
+		name:       "custom channels single asset multi input",
+		test:       testCustomChannelsSingleAssetMultiInput,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels oracle pricing",
-		test: testCustomChannelsOraclePricing,
+		name:       "custom channels oracle pricing",
+		test:       testCustomChannelsOraclePricing,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels fee",
-		test: testCustomChannelsFee,
+		name:       "custom channels fee",
+		test:       testCustomChannelsFee,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels forward bandwidth",
-		test: testCustomChannelsForwardBandwidth,
+		name:       "custom channels forward bandwidth",
+		test:       testCustomChannelsForwardBandwidth,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels strict forwarding",
-		test: testCustomChannelsStrictForwarding,
+		name:       "custom channels strict forwarding",
+		test:       testCustomChannelsStrictForwarding,
+		noAliceBob: true,
 	},
 	{
-		name: "test custom channels decode payreq",
-		test: testCustomChannelsDecodeAssetInvoice,
+		name:       "custom channels decode payreq",
+		test:       testCustomChannelsDecodeAssetInvoice,
+		noAliceBob: true,
 	},
 }

itest/network_harness.go

@@ -122,8 +122,8 @@ func (n *NetworkHarness) ProcessErrors() <-chan error {
 // rpc clients capable of communicating with the initial seeder nodes are
 // created. Nodes are initialized with the given extra command line flags, which
 // should be formatted properly - "--arg=value".
-func (n *NetworkHarness) SetUp(t *testing.T,
-	testCase string, lndArgs []string) error {
+func (n *NetworkHarness) SetUp(t *testing.T, testCase string, lndArgs []string,
+	noAliceBob bool) error {
 
 	// Swap out grpc's default logger with our fake logger which drops the
 	// statements on the floor.
@@ -143,6 +143,11 @@ func (n *NetworkHarness) SetUp(t *testing.T,
 	n.autopilotServer = mock.NewServer()
 	require.NoError(t, n.autopilotServer.Start())
 
+	// Skip early if we don't need the default Alice and Bob nodes.
+	if noAliceBob {
+		return nil
+	}
+
 	// Start the initial seeder nodes within the test network, then connect
 	// their respective RPC clients.
 	eg := errgroup.Group{}
@@ -252,6 +257,20 @@ out:
 		}
 	}
 
+	t.Cleanup(func() {
+		require.NoError(t, n.TearDown())
+		n.Stop()
+	})
+
+	n.EnsureConnected(t, n.Alice, n.Bob)
+
+	logLine := fmt.Sprintf(
+		"STARTING ============ %v ============\n", testCase,
+	)
+
+	n.Alice.AddToLog(logLine)
+	n.Bob.AddToLog(logLine)
+
 	return nil
 }
 

itest/test_harness.go

@@ -126,7 +126,9 @@ func getLitdBinary() string {
 
 type testCase struct {
 	name string
-	test func(ctx context.Context, net *NetworkHarness, t *harnessTest)
+	test func(ctx context.Context, net *NetworkHarness,
+		t *harnessTest)
+	noAliceBob bool
 }
 
 // waitForNTxsInMempool polls until finding the desired number of transactions