From 63611604a661385e5225ec0b9a6311ec15cc9cfa Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Fri, 1 Dec 2023 18:35:27 -0500 Subject: [PATCH] itest: don't sync test nodes to each other Since we now have a main universe server by default, we can disable test nodes syncing directly to each other by default. --- itest/addrs_test.go | 8 -------- itest/collectible_split_test.go | 4 ---- itest/full_value_split_test.go | 4 ---- itest/multi_asset_group_test.go | 8 -------- itest/psbt_test.go | 32 -------------------------------- itest/re-issuance_test.go | 9 --------- itest/re-org_test.go | 12 ------------ itest/round_trip_send_test.go | 4 ---- itest/send_test.go | 18 ------------------ 9 files changed, 99 deletions(-) diff --git a/itest/addrs_test.go b/itest/addrs_test.go index 93a0eda4b..657cafc64 100644 --- a/itest/addrs_test.go +++ b/itest/addrs_test.go @@ -40,10 +40,6 @@ func testAddresses(t *harnessTest) { // assets made above. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -169,10 +165,6 @@ func testMultiAddress(t *harnessTest) { alice := t.tapd bob := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = alice - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, bob.stop(!*noDelete)) diff --git a/itest/collectible_split_test.go b/itest/collectible_split_test.go index f8fd17035..2f987e8e7 100644 --- a/itest/collectible_split_test.go +++ b/itest/collectible_split_test.go @@ -53,10 +53,6 @@ func testCollectibleSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/full_value_split_test.go b/itest/full_value_split_test.go index c60a53ff6..84afb2430 100644 --- a/itest/full_value_split_test.go +++ b/itest/full_value_split_test.go @@ -33,10 +33,6 @@ func testFullValueSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/multi_asset_group_test.go b/itest/multi_asset_group_test.go index 82d9706a0..3dae13188 100644 --- a/itest/multi_asset_group_test.go +++ b/itest/multi_asset_group_test.go @@ -97,10 +97,6 @@ func testMintMultiAssetGroups(t *harnessTest) { // ensure that they can be sent and received correctly. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = 4 - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -325,10 +321,6 @@ func testMultiAssetGroupSend(t *harnessTest) { // assets made above. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = groupCount - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/psbt_test.go b/itest/psbt_test.go index c0711ce4e..245ac0566 100644 --- a/itest/psbt_test.go +++ b/itest/psbt_test.go @@ -44,10 +44,6 @@ func testPsbtScriptHashLockSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -170,10 +166,6 @@ func testPsbtScriptCheckSigSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -315,10 +307,6 @@ func testPsbtNormalInteractiveFullValueSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -366,10 +354,6 @@ func testPsbtGroupedInteractiveFullValueSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -526,10 +510,6 @@ func testPsbtNormalInteractiveSplitSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -577,10 +557,6 @@ func testPsbtGroupedInteractiveSplitSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -735,10 +711,6 @@ func testPsbtInteractiveTapscriptSibling(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(p *tapdHarnessParams) { - p.startupSyncNode = t.tapd - p.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -863,10 +835,6 @@ func testPsbtMultiSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/re-issuance_test.go b/itest/re-issuance_test.go index 6c140dab2..a043fb1df 100644 --- a/itest/re-issuance_test.go +++ b/itest/re-issuance_test.go @@ -51,13 +51,8 @@ func testReIssuance(t *harnessTest) { // Create a second node, which will have no information about previously // minted assets or asset groups. - numTotalAssets := len(normalGroupGen) + len(collectGroupGen) secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = numTotalAssets - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -341,10 +336,6 @@ func testMintWithGroupKeyErrors(t *harnessTest) { // minted assets or asset groups. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(collectGroupGen) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/re-org_test.go b/itest/re-org_test.go index 6f3524b08..21e29a79e 100644 --- a/itest/re-org_test.go +++ b/itest/re-org_test.go @@ -53,10 +53,6 @@ func testReOrgMint(t *harnessTest) { // node will be used to synchronize universe state. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(assetList) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -139,10 +135,6 @@ func testReOrgSend(t *harnessTest) { // node will be used to synchronize universe state. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(assetList) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -262,10 +254,6 @@ func testReOrgMintAndSend(t *harnessTest) { // node will be used to synchronize universe state. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(assetList) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/round_trip_send_test.go b/itest/round_trip_send_test.go index 87bdb5ca6..d312eed21 100644 --- a/itest/round_trip_send_test.go +++ b/itest/round_trip_send_test.go @@ -41,10 +41,6 @@ func testRoundTripSend(t *harnessTest) { // serve as the node which'll receive the assets. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) diff --git a/itest/send_test.go b/itest/send_test.go index a57301dc6..c7ab48f26 100644 --- a/itest/send_test.go +++ b/itest/send_test.go @@ -88,10 +88,6 @@ func testBasicSendUnidirectional(t *harnessTest) { // node will be used to synchronize universe state. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete)) @@ -215,8 +211,6 @@ func testRestartReceiverCheckBalance(t *harnessTest) { recvTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) params.custodianProofRetrievalDelay = &custodianProofRetrievalDelay }, ) @@ -458,10 +452,6 @@ func testBasicSendPassiveAsset(t *harnessTest) { // Set up a new node that will serve as the receiving node. recvTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, recvTapd.stop(!*noDelete)) @@ -1212,10 +1202,6 @@ func testMultiInputSendNonInteractiveSingleID(t *harnessTest) { // node. Sync the new node with the primary node. bobTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, bobTapd.stop(!*noDelete)) @@ -1305,10 +1291,6 @@ func testSendMultipleCoins(t *harnessTest) { // node will be used to synchronize universe state. secondTapd := setupTapdHarness( t.t, t, t.lndHarness.Bob, t.universeServer, - func(params *tapdHarnessParams) { - params.startupSyncNode = t.tapd - params.startupSyncNumAssets = len(rpcAssets) - }, ) defer func() { require.NoError(t.t, secondTapd.stop(!*noDelete))