Merge pull request lightninglabs#712 from lightninglabs/itest-proof-c…

…ourier

itest: add main universe server harness, turn on proof courier for all test cases

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))
@@ -79,12 +75,6 @@ func testAddresses(t *harnessTest) {
 		// Eventually the event should be marked as confirmed.
 		AssertAddrEvent(t.t, secondTapd, addr, 1, statusConfirmed)
 
-		// To complete the transfer, we'll export the proof from the
-		// sender and import it into the receiver for each asset set.
-		sendProof(
-			t, t.tapd, secondTapd, addr.ScriptKey, a.AssetGenesis,
-		)
-
 		// Make sure we have imported and finalized all proofs.
 		AssertNonInteractiveRecvComplete(t.t, secondTapd, idx+1)
 
@@ -175,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))
@@ -195,7 +181,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))
 	}()
@@ -321,8 +312,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
 			},
 		)
@@ -436,21 +428,18 @@ func runMultiSendTest(ctxt context.Context, t *harnessTest, alice,
 
 	// In order to force a split, we don't try to send the full asset.
 	const sendAmt = 100
-	var bobAddresses []*taprpc.Addr
 	bobAddr1, err := bob.NewAddr(ctxt, &taprpc.NewAddrRequest{
 		AssetId: genInfo.AssetId,
 		Amt:     sendAmt,
 	})
 	require.NoError(t.t, err)
-	bobAddresses = append(bobAddresses, bobAddr1)
 	AssertAddrCreated(t.t, bob, mintedAsset, bobAddr1)
 
 	bobAddr2, err := bob.NewAddr(ctxt, &taprpc.NewAddrRequest{
 		AssetId: genInfo.AssetId,
 		Amt:     sendAmt,
 	})
 	require.NoError(t.t, err)
-	bobAddresses = append(bobAddresses, bobAddr2)
 	AssertAddrCreated(t.t, bob, mintedAsset, bobAddr2)
 
 	// To test that Alice can also receive to multiple addresses in a single
@@ -492,14 +481,6 @@ func runMultiSendTest(ctxt context.Context, t *harnessTest, alice,
 	// this point, so the status should go to completed directly.
 	AssertAddrEventByStatus(t.t, alice, statusCompleted, numRuns*2)
 
-	// To complete the transfer, we'll export the proof from the sender and
-	// import it into the receiver for each asset set. This should not be
-	// necessary for the sends to Alice, as she is both the sender and
-	// receiver and should detect the local proof once it's written to disk.
-	for i := range bobAddresses {
-		sendProof(t, alice, bob, bobAddresses[i].ScriptKey, genInfo)
-	}
-
 	// Make sure we have imported and finalized all proofs.
 	AssertNonInteractiveRecvComplete(t.t, bob, numRuns*2)
 	AssertNonInteractiveRecvComplete(t.t, alice, numRuns*2)

itest/aperture_harness.go

@@ -27,7 +27,7 @@ type ApertureHarness struct {
 
 // NewApertureHarness creates a new instance of the aperture service. It returns
 // a harness which includes useful values for testing.
-func NewApertureHarness(t *testing.T, port int) ApertureHarness {
+func NewApertureHarness(t *testing.T, port int) *ApertureHarness {
 	// Create a temporary directory for the aperture service to use.
 	baseDir := filepath.Join(t.TempDir(), "aperture")
 	err := os.MkdirAll(baseDir, os.ModePerm)
@@ -55,7 +55,7 @@ func NewApertureHarness(t *testing.T, port int) ApertureHarness {
 	}
 	service := aperture.NewAperture(cfg)
 
-	return ApertureHarness{
+	return &ApertureHarness{
 		ListenAddr: listenAddr,
 		Service:    service,
 	}

itest/assertions.go

@@ -870,7 +870,7 @@ func AssertBalanceByID(t *testing.T, client taprpc.TaprootAssetsClient,
 	}
 
 	require.True(t, ok)
-	require.Equal(t, uint64(amt), uint64(balance.Balance))
+	require.Equal(t, amt, balance.Balance)
 }
 
 // AssertBalanceByGroup asserts that the balance of a single asset group

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))

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))
@@ -88,8 +84,8 @@ func runFullValueSendTests(ctxt context.Context, t *harnessTest, alice,
 				[]uint64{0, fullAmount}, senderTransferIdx,
 				senderTransferIdx+1,
 			)
-			_ = sendProof(
-				t, alice, bob, receiverAddr.ScriptKey, genInfo,
+			AssertNonInteractiveRecvComplete(
+				t.t, bob, senderTransferIdx+1,
 			)
 			senderTransferIdx++
 		} else {
@@ -108,8 +104,8 @@ func runFullValueSendTests(ctxt context.Context, t *harnessTest, alice,
 				genInfo.AssetId, []uint64{0, fullAmount},
 				receiverTransferIdx, receiverTransferIdx+1,
 			)
-			_ = sendProof(
-				t, bob, alice, receiverAddr.ScriptKey, genInfo,
+			AssertNonInteractiveRecvComplete(
+				t.t, alice, receiverTransferIdx+1,
 			)
 			receiverTransferIdx++
 		}

itest/integration_test.go

@@ -59,11 +59,10 @@ func TestTaprootAssetsDaemon(t *testing.T) {
 			// The universe server and tapd client are both freshly
 			// created and later discarded for each test run to
 			// assure no state is taken over between runs.
-			tapdHarness, universeServer, proofCourier :=
-				setupHarnesses(
-					t1, ht, lndHarness,
-					testCase.proofCourierType,
-				)
+			tapdHarness, uniHarness, proofCourier := setupHarnesses(
+				t1, ht, lndHarness,
+				testCase.proofCourierType,
+			)
 			lndHarness.EnsureConnected(
 				lndHarness.Alice, lndHarness.Bob,
 			)
@@ -72,8 +71,8 @@ func TestTaprootAssetsDaemon(t *testing.T) {
 			lndHarness.Bob.AddToLogf(logLine)
 
 			ht := ht.newHarnessTest(
-				t1, lndHarness, universeServer,
-				tapdHarness, proofCourier,
+				t1, lndHarness, uniHarness, tapdHarness,
+				proofCourier,
 			)
 
 			// Now we have everything to run the test case.

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/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))
@@ -129,10 +125,6 @@ func testMintMultiAssetGroups(t *harnessTest) {
 		normalMember.AssetGenesis.AssetId,
 		[]uint64{0, normalMember.Amount}, 0, 1,
 	)
-	_ = sendProof(
-		t, t.tapd, secondTapd, bobNormalAddr.ScriptKey,
-		normalMemberGenInfo,
-	)
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 
 	AssertBalanceByGroup(
@@ -170,10 +162,6 @@ func testMintMultiAssetGroups(t *harnessTest) {
 		collectMember.AssetGenesis.AssetId,
 		[]uint64{0, collectMember.Amount}, 1, 2,
 	)
-	sendProof(
-		t, t.tapd, secondTapd, bobCollectAddr.ScriptKey,
-		collectMemberGenInfo,
-	)
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 2)
 
 	AssertBalanceByGroup(
@@ -333,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))