itest: remove manual proof transfer for addr sends

With this commit we remove all instances of the manual proof transfer
from call sites that do an actual non-interactive (address based)
transfer, for which a proof courier should now handle the proof
transmission.

Author: guggero

itest/addrs_test.go

@@ -79,12 +79,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)
 
@@ -436,21 +430,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 +483,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/full_value_split_test.go

@@ -88,8 +88,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 +108,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/multi_asset_group_test.go

@@ -129,10 +129,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 +166,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(

itest/psbt_test.go

@@ -132,6 +132,10 @@ func testPsbtScriptHashLockSend(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, bob, sendResp,
 		genInfo.AssetId, []uint64{numUnits / 2, numUnits / 2}, 0, 1,
 	)
+
+	// This is an interactive/PSBT based transfer, so we do need to manually
+	// send the proof from the sender to the receiver because the proof
+	// courier address gets lost in the address->PSBT conversion.
 	_ = sendProof(t, bob, alice, aliceAddr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, alice, 1)
 
@@ -258,6 +262,10 @@ func testPsbtScriptCheckSigSend(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, bob, sendResp,
 		genInfo.AssetId, []uint64{numUnits / 2, numUnits / 2}, 0, 1,
 	)
+
+	// This is an interactive/PSBT based transfer, so we do need to manually
+	// send the proof from the sender to the receiver because the proof
+	// courier address gets lost in the address->PSBT conversion.
 	_ = sendProof(t, bob, alice, aliceAddr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, alice, 1)
 
@@ -438,6 +446,9 @@ func runPsbtInteractiveFullValueSendTest(ctxt context.Context, t *harnessTest,
 			sendResp, genInfo.AssetId, amounts, i/2, (i/2)+1,
 			numOutputs,
 		)
+
+		// This is an interactive transfer, so we do need to manually
+		// send the proof from the sender to the receiver.
 		_ = sendProof(
 			t, sender, receiver,
 			receiverScriptKey.PubKey.SerializeCompressed(), genInfo,
@@ -656,6 +667,9 @@ func runPsbtInteractiveSplitSendTest(ctxt context.Context, t *harnessTest,
 			[]uint64{sendAmt, changeAmt}, i/2, (i/2)+1,
 			numOutputs,
 		)
+
+		// This is an interactive transfer, so we do need to manually
+		// send the proof from the sender to the receiver.
 		_ = sendProof(
 			t, sender, receiver,
 			receiverScriptKey.PubKey.SerializeCompressed(), genInfo,
@@ -779,6 +793,9 @@ func testPsbtInteractiveTapscriptSibling(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, alice, sendResp,
 		genInfo.AssetId, []uint64{sendAmt, changeAmt}, 0, 1, 2,
 	)
+
+	// This is an interactive transfer, so we do need to manually send the
+	// proof from the sender to the receiver.
 	_ = sendProof(
 		t, alice, bob,
 		receiverScriptKey.PubKey.SerializeCompressed(), genInfo,
@@ -927,6 +944,9 @@ func testPsbtMultiSend(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, sender, sendResp,
 		genInfo.AssetId, outputAmounts, 0, 1, numOutputs,
 	)
+
+	// This is an interactive transfer, so we do need to manually send the
+	// proof from the sender to the receiver.
 	_ = sendProof(
 		t, sender, receiver,
 		receiverScriptKey1.PubKey.SerializeCompressed(), genInfo,
@@ -1034,7 +1054,6 @@ func sendToTapscriptAddr(ctx context.Context, t *harnessTest, alice,
 		t.t, t.lndHarness.Miner.Client, alice, sendResp,
 		genInfo.AssetId, []uint64{changeUnits, numUnits}, 0, 1,
 	)
-	_ = sendProof(t, alice, bob, bobAddr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, bob, 1)
 }
 
@@ -1059,7 +1078,6 @@ func sendAssetAndAssert(ctx context.Context, t *harnessTest, alice,
 		genInfo.AssetId, []uint64{change, numUnits}, outTransferIdx,
 		numOutTransfers,
 	)
-	_ = sendProof(t, alice, bob, bobAddr.ScriptKey, genInfo)
 
 	// There are now two receive events (since only non-interactive sends
 	// appear in that RPC output).

itest/re-issuance_test.go

@@ -78,10 +78,7 @@ func testReIssuance(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, t.tapd, firstCollectSend,
 		collectGenInfo.AssetId, []uint64{0, 1}, 0, 1,
 	)
-	sendProof(
-		t, t.tapd, secondTapd, collectGroupAddr.ScriptKey,
-		collectGenInfo,
-	)
+	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 
 	// Check the state of both nodes. The first node should show one
 	// zero-value transfer representing the send of the collectible.
@@ -107,10 +104,7 @@ func testReIssuance(t *harnessTest) {
 		normalGenInfo.AssetId,
 		[]uint64{normalGroupMintHalf, normalGroupMintHalf}, 1, 2,
 	)
-	sendProof(
-		t, t.tapd, secondTapd, normalGroupAddr.ScriptKey,
-		normalGenInfo,
-	)
+	AssertNonInteractiveRecvComplete(t.t, secondTapd, 2)
 
 	// Reissue one more collectible and half the original mint amount for
 	// the normal asset.
@@ -186,10 +180,7 @@ func testReIssuance(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, t.tapd, secondCollectSend,
 		collectReissueInfo.AssetId, []uint64{0, 1}, 2, 3,
 	)
-	sendProof(
-		t, t.tapd, secondTapd, collectReissueAddr.ScriptKey,
-		collectReissueInfo,
-	)
+	AssertNonInteractiveRecvComplete(t.t, secondTapd, 3)
 
 	// The second node should show two groups, with two assets in
 	// the collectible group and a total balance of 2 for that group.
@@ -220,10 +211,7 @@ func testReIssuance(t *harnessTest) {
 		t.t, secondTapd.ht.lndHarness.Miner.Client, secondTapd,
 		thirdCollectSend, collectGenInfo.AssetId, []uint64{0, 1}, 0, 1,
 	)
-	sendProof(
-		t, secondTapd, t.tapd, collectReissueAddr.ScriptKey,
-		collectReissueInfo,
-	)
+	AssertNonInteractiveRecvComplete(t.t, t.tapd, 1)
 
 	// The collectible balance on the minting node should be 1, and there
 	// should still be only two groups.
@@ -382,12 +370,8 @@ func testMintWithGroupKeyErrors(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, t.tapd, collectSend,
 		collectGenInfo.AssetId, []uint64{0, 1}, 0, 1,
 	)
-	sendProof(
-		t, t.tapd, secondTapd, collectGroupAddr.ScriptKey,
-		collectGenInfo,
-	)
 
-	// A reissuance with the second node should still fail because the
+	// A re-issuance with the second node should still fail because the
 	// group key was not created by that node.
 	_, err = secondTapd.MintAsset(ctxb, reissueRequest)
 	require.ErrorContains(t.t, err, "can't sign with group key")

itest/re-org_test.go

@@ -170,9 +170,6 @@ func testReOrgSend(t *harnessTest) {
 		sendAssetGen.AssetId,
 		[]uint64{sendAsset.Amount - sendAmount, sendAmount}, 0, 1,
 	)
-	_ = sendProof(
-		t, t.tapd, secondTapd, bobAddr.ScriptKey, sendAssetGen,
-	)
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 	initialBlockHash := initialBlock.BlockHash()
 
@@ -291,9 +288,6 @@ func testReOrgMintAndSend(t *harnessTest) {
 		sendAssetGen.AssetId,
 		[]uint64{sendAsset.Amount - sendAmount, sendAmount}, 0, 1,
 	)
-	_ = sendProof(
-		t, t.tapd, secondTapd, bobAddr.ScriptKey, sendAssetGen,
-	)
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 	initialBlockHash := initialBlock.BlockHash()
 

itest/round_trip_send_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/hex"
-	"time"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcutil"
@@ -81,7 +80,7 @@ func testRoundTripSend(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, t.tapd, sendResp,
 		genInfo.AssetId, []uint64{bobAmt, bobAmt}, 0, 1,
 	)
-	_ = sendProof(t, t.tapd, secondTapd, bobAddr.ScriptKey, genInfo)
+	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 
 	// Now, Alice will request half of the assets she sent to Bob.
 	aliceAddr, err := t.tapd.NewAddr(ctxb, &taprpc.NewAddrRequest{
@@ -101,10 +100,7 @@ func testRoundTripSend(t *harnessTest) {
 		t.t, t.lndHarness.Miner.Client, secondTapd,
 		sendResp, genInfo.AssetId, []uint64{aliceAmt, aliceAmt}, 0, 1,
 	)
-	_ = sendProof(t, secondTapd, t.tapd, aliceAddr.ScriptKey, genInfo)
-
-	// Give both nodes some time to process the final transfer.
-	time.Sleep(time.Second * 1)
+	AssertNonInteractiveRecvComplete(t.t, t.tapd, 1)
 
 	// Check the final state of both nodes. Each node should list
 	// one transfer, and Alice should have 3/4 of the total units.

itest/send_test.go

@@ -1240,7 +1240,6 @@ func testMultiInputSendNonInteractiveSingleID(t *harnessTest) {
 		genInfo.AssetId, []uint64{4000, 1000}, 0, 1,
 	)
 
-	_ = sendProof(t, t.tapd, bobTapd, addr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, bobTapd, 1)
 
 	// Second of two send events from minting node to the secondary node.
@@ -1261,7 +1260,6 @@ func testMultiInputSendNonInteractiveSingleID(t *harnessTest) {
 		genInfo.AssetId, []uint64{0, 4000}, 1, 2,
 	)
 
-	_ = sendProof(t, t.tapd, bobTapd, addr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, bobTapd, 2)
 
 	t.Logf("Two separate send events complete, now attempting to send " +
@@ -1285,7 +1283,6 @@ func testMultiInputSendNonInteractiveSingleID(t *harnessTest) {
 		genInfo.AssetId, []uint64{0, 5000}, 0, 1,
 	)
 
-	_ = sendProof(t, bobTapd, t.tapd, addr.ScriptKey, genInfo)
 	AssertNonInteractiveRecvComplete(t.t, t.tapd, 1)
 }
 
@@ -1388,9 +1385,6 @@ func testSendMultipleCoins(t *harnessTest) {
 	// Now we confirm the 5 transfers and make sure they complete as
 	// expected.
 	_ = MineBlocks(t.t, t.lndHarness.Miner.Client, 1, 5)
-	for _, addr := range bobAddrs {
-		_ = sendProof(t, t.tapd, secondTapd, addr.ScriptKey, genInfo)
-	}
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 5)
 }