itest: add main universe server as federation member

By default we want all new tapd instances to be synced with the main
universe server, so we add it as a federation member unless specifically
disabled.

Author: guggero

itest/addrs_test.go

@@ -189,7 +189,12 @@ func testMultiAddress(t *harnessTest) {
 func testAddressAssetSyncer(t *harnessTest) {
 	// We'll kick off the test by making a new node, without hooking it up
 	// to any existing Universe server.
-	bob := setupTapdHarness(t.t, t, t.lndHarness.Bob, nil)
+	bob := setupTapdHarness(
+		t.t, t, t.lndHarness.Bob, t.universeServer,
+		func(params *tapdHarnessParams) {
+			params.noDefaultUniverseSync = true
+		},
+	)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))
 	}()
@@ -315,8 +320,9 @@ func testAddressAssetSyncer(t *harnessTest) {
 	restartBobNoUniSync := func(disableSyncer bool) {
 		require.NoError(t.t, bob.stop(!*noDelete))
 		bob = setupTapdHarness(
-			t.t, t, t.lndHarness.Bob, nil,
+			t.t, t, t.lndHarness.Bob, t.universeServer,
 			func(params *tapdHarnessParams) {
+				params.noDefaultUniverseSync = true
 				params.addrAssetSyncerDisable = disableSyncer
 			},
 		)

itest/mint_batch_stress_test.go

@@ -57,7 +57,7 @@ func testMintBatchNStressTest(t *harnessTest, batchSize int,
 	// If we create a second tapd instance and sync the universe state,
 	// the synced tree should match the source tree.
 	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, nil,
+		t.t, t, t.lndHarness.Bob, t.universeServer,
 	)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))

itest/test_harness.go

@@ -240,6 +240,25 @@ func (h *harnessTest) syncUniverseState(target, syncer *tapdHarness,
 	require.Equal(h.t, numExpectedAssets, numAssets)
 }
 
+// addFederationServer adds a new federation server to the given tapd harness.
+func (h *harnessTest) addFederationServer(host string, target *tapdHarness) {
+	ctxt, cancel := context.WithTimeout(
+		context.Background(), defaultWaitTimeout,
+	)
+	defer cancel()
+
+	_, err := target.AddFederationServer(
+		ctxt, &unirpc.AddFederationServerRequest{
+			Servers: []*unirpc.UniverseFederationServer{
+				{
+					Host: host,
+				},
+			},
+		},
+	)
+	require.NoError(h.t, err)
+}
+
 // nextAvailablePort returns the first port that is available for listening by
 // a new node. It panics if no port is found and the maximum available TCP port
 // is reached.
@@ -346,6 +365,10 @@ type tapdHarnessParams struct {
 	// startupSyncNumAssets is the number of assets that are expected to be
 	// synced from the above node.
 	startupSyncNumAssets int
+
+	// noDefaultUniverseSync indicates whether the default universe server
+	// should be added as a federation server or not.
+	noDefaultUniverseSync bool
 }
 
 type Option func(*tapdHarnessParams)
@@ -391,6 +414,12 @@ func setupTapdHarness(t *testing.T, ht *harnessTest,
 	err = tapdHarness.start(params.expectErrExit)
 	require.NoError(t, err)
 
+	// Add the default universe server as a federation server, unless
+	// specifically indicated by the caller.
+	if !params.noDefaultUniverseSync {
+		ht.addFederationServer(universe.service.rpcHost(), tapdHarness)
+	}
+
 	// Before we exit, we'll check to see if we need to sync the universe
 	// state.
 	if params.startupSyncNode != nil {

itest/universe_pagination_test.go

@@ -36,7 +36,7 @@ func testUniversePaginationSimple(t *harnessTest) {
 	// If we create a second tapd instance and sync the universe state,
 	// the synced tree should match the source tree.
 	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, nil,
+		t.t, t, t.lndHarness.Bob, t.universeServer,
 	)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))

itest/universe_test.go

@@ -42,7 +42,10 @@ func testUniverseSync(t *harnessTest) {
 	// With those assets created, we'll now create a new node that we'll
 	// use to exercise the Universe sync.
 	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, nil,
+		t.t, t, t.lndHarness.Bob, t.universeServer,
+		func(params *tapdHarnessParams) {
+			params.noDefaultUniverseSync = true
+		},
 	)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))
@@ -385,7 +388,10 @@ func testUniverseFederation(t *harnessTest) {
 	// We'll kick off the test by making a new node, without hooking it up to
 	// any existing Universe server.
 	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, nil,
+		t.t, t, t.lndHarness.Bob, t.universeServer,
+		func(params *tapdHarnessParams) {
+			params.noDefaultUniverseSync = true
+		},
 	)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))