itest: fix itest after lnd update

Author: guggero

itest/addrs_test.go

@@ -44,9 +44,8 @@ func testAddresses(t *harnessTest) {
 
 	// We'll make a second node now that'll be the receiver of all the
 	// assets made above.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()
@@ -183,7 +182,7 @@ func testAddresses(t *harnessTest) {
 		Amount: 22,
 	}
 	manualAsset, mintProofBlob, mintOP := ManualMintSimpleAsset(
-		t, t.lndHarness.Alice, t.tapd, commitment.TapCommitmentV0, &req,
+		t, t.tapd.cfg.LndNode, t.tapd, commitment.TapCommitmentV0, &req,
 	)
 
 	numAssets := 2
@@ -267,9 +266,8 @@ func testMultiAddress(t *harnessTest) {
 	// We'll make a second node now that'll be the receiver of all the
 	// assets made above.
 	alice := t.tapd
-	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	bob := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))
 	}()
@@ -312,8 +310,9 @@ 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.
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
 	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
+		t.t, t, bobLnd, t.universeServer,
 		func(params *tapdHarnessParams) {
 			params.noDefaultUniverseSync = true
 		},
@@ -443,7 +442,7 @@ func testAddressAssetSyncer(t *harnessTest) {
 	restartBobNoUniSync := func(disableSyncer bool) {
 		require.NoError(t.t, bob.stop(!*noDelete))
 		bob = setupTapdHarness(
-			t.t, t, t.lndHarness.Bob, t.universeServer,
+			t.t, t, bobLnd, t.universeServer,
 			func(params *tapdHarnessParams) {
 				params.noDefaultUniverseSync = true
 				params.addrAssetSyncerDisable = disableSyncer
@@ -685,9 +684,8 @@ func testUnknownTlvType(t *harnessTest) {
 	// We'll make a second node now that'll be the receiver of all the
 	// assets made above.
 	alice := t.tapd
-	bob := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	bob := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))
 	}()
@@ -766,9 +764,7 @@ func testUnknownTlvType(t *harnessTest) {
 	require.NoError(t.t, err)
 
 	// We make a new node to import the modified proof.
-	charlie := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	charlie := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, charlie.stop(!*noDelete))
 	}()

itest/assets_test.go

@@ -507,8 +507,9 @@ func testMintAssetsWithTapscriptSibling(t *harnessTest) {
 
 	// Make a non-tap output from Bob to use in a TX spending Alice's
 	// genesis UTXO.
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
 	burnOutput := MakeOutput(
-		t, t.lndHarness.Bob, lnrpc.AddressType_TAPROOT_PUBKEY, 500,
+		t, bobLnd, lnrpc.AddressType_TAPROOT_PUBKEY, 500,
 	)
 
 	// Construct and publish the TX.
@@ -528,16 +529,16 @@ func testMintAssetsWithTapscriptSibling(t *harnessTest) {
 
 	var burnTxBuf bytes.Buffer
 	require.NoError(t.t, burnTx.Serialize(&burnTxBuf))
-	t.lndHarness.Bob.RPC.PublishTransaction(&walletrpc.Transaction{
+	bobLnd.RPC.PublishTransaction(&walletrpc.Transaction{
 		TxHex: burnTxBuf.Bytes(),
 	})
 
 	// Bob should detect the TX, and the resulting confirmed UTXO once
 	// a new block is mined.
 	t.lndHarness.Miner().AssertNumTxsInMempool(1)
-	t.lndHarness.AssertNumUTXOsUnconfirmed(t.lndHarness.Bob, 1)
+	t.lndHarness.AssertNumUTXOsUnconfirmed(bobLnd, 1)
 	t.lndHarness.MineBlocksAndAssertNumTxes(1, 1)
-	t.lndHarness.AssertNumUTXOsWithConf(t.lndHarness.Bob, 1, 1, 1)
+	t.lndHarness.AssertNumUTXOsWithConf(bobLnd, 1, 1, 1)
 }
 
 // testMintBatchAndTransfer tests that we can mint a batch of assets, observe
@@ -557,9 +558,8 @@ func testMintBatchAndTransfer(t *harnessTest) {
 
 	// We'll make a second node now that'll be the receiver of all the
 	// assets made above.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	bobLnd := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()
@@ -676,7 +676,7 @@ func testAssetBalances(t *harnessTest) {
 		anchorTxid         = out.Hash.CloneBytes()
 		anchorVout         = out.Index
 		aliceTapd          = t.tapd
-		bobLnd             = t.lndHarness.Bob
+		bobLnd             = t.lndHarness.NewNodeWithCoins("Bob", nil)
 	)
 
 	// We create a second tapd node that will be used to simulate a second

itest/channels_test.go

@@ -47,7 +47,8 @@ func testChannelRPCs(t *harnessTest) {
 	require.ErrorContains(t.t, err, "only available when running inside")
 
 	// Try the keysend path first, which should go all the way through to
-	// lnd, where it should fail because we didn't set a timeout.
+	// lnd, where it should fail because we didn't set a destination public
+	// key.
 	stream, err := t.tapd.SendPayment(ctx, &tchrpc.SendPaymentRequest{
 		AssetAmount: 123,
 		AssetId:     dummyByteArr[:],
@@ -60,12 +61,12 @@ func testChannelRPCs(t *harnessTest) {
 	require.NoError(t.t, err)
 
 	_, err = stream.Recv()
-	require.ErrorContains(t.t, err, "timeout_seconds")
+	require.ErrorContains(t.t, err, "invalid vertex length of 0, want 33")
 
 	// Now let's also try the invoice path, which should fail because we
 	// don't have any asset channels with peers that we could ask for a
 	// quote.
-	invoiceResp := t.lndHarness.Alice.RPC.AddInvoice(&lnrpc.Invoice{
+	invoiceResp := t.tapd.cfg.LndNode.RPC.AddInvoice(&lnrpc.Invoice{
 		AmtPaidSat: 1234,
 	})
 	stream, err = t.tapd.SendPayment(ctx, &tchrpc.SendPaymentRequest{

itest/collectible_split_test.go

@@ -51,9 +51,8 @@ func testCollectibleSend(t *harnessTest) {
 
 	// Now that we have the asset created, we'll make a new node that'll
 	// serve as the node which'll receive the assets.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()
@@ -334,9 +333,8 @@ func testCollectibleGroupSend(t *harnessTest) {
 	})
 	require.True(t.t, correctOp)
 
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()

itest/fee_estimation_test.go

@@ -56,8 +56,8 @@ func testFeeEstimation(t *harnessTest) {
 
 	// Set the initial state of the wallet of the first node. The wallet
 	// state will reset at the end of this test.
-	SetNodeUTXOs(t, t.lndHarness.Alice, btcutil.Amount(1), initialUTXOs)
-	defer ResetNodeWallet(t, t.lndHarness.Alice)
+	SetNodeUTXOs(t, t.tapd.cfg.LndNode, btcutil.Amount(1), initialUTXOs)
+	defer ResetNodeWallet(t, t.tapd.cfg.LndNode)
 
 	t.lndHarness.SetFeeEstimateWithConf(defaultFeeRate, 6)
 
@@ -154,7 +154,7 @@ func testFeeEstimation(t *harnessTest) {
 	)
 
 	SetNodeUTXOs(
-		t, t.lndHarness.Alice, btcutil.Amount(1),
+		t, t.tapd.cfg.LndNode, btcutil.Amount(1),
 		[]*UTXORequest{initialUTXOs[3]},
 	)
 

itest/full_value_split_test.go

@@ -31,9 +31,8 @@ func testFullValueSend(t *harnessTest) {
 
 	// Now that we have the asset created, we'll make a new node that'll
 	// serve as the node which'll receive the assets.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()

itest/integration_test.go

@@ -5,9 +5,7 @@ package itest
 import (
 	"context"
 	"flag"
-	"fmt"
 	"testing"
-	"time"
 
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightningnetwork/lnd/lntest"
@@ -41,49 +39,37 @@ func TestTaprootAssetsDaemon(t *testing.T) {
 	lndHarness := lntest.SetupHarness(
 		t, "./lnd-itest", "bbolt", true, feeService,
 	)
-	defer func() {
-		// There is a timing issue in here somewhere. If we shut down
-		// lnd immediately after stopping the tapd server, sometimes
-		// we get a race in the TX notifier chan closes. The wait seems
-		// to fix it for now...
-		time.Sleep(100 * time.Millisecond)
-		lndHarness.Stop()
-	}()
-
-	lndHarness.SetupStandbyNodes()
-
-	// Create a new LND node for use with the universe server.
-	t.Log("Starting universe server LND node")
-	uniServerLndHarness := lndHarness.NewNode("uni-server-lnd", nil)
-
-	// Wait for the new LND node to be fully synced to the blockchain.
-	lndHarness.WaitForBlockchainSync(uniServerLndHarness)
+	t.Cleanup(func() {
+		lndHarness.CleanShutDown()
+	})
 
 	t.Logf("Running %v integration tests", len(testList))
 	for _, testCase := range testList {
-		logLine := fmt.Sprintf("STARTING ============ %v ============\n",
-			testCase.name)
-
 		success := t.Run(testCase.name, func(t1 *testing.T) {
+			// Create a new LND node for use with the universe
+			// server.
+			t.Log("Starting universe server LND node")
+			uniServerLndHarness := lndHarness.NewNode(
+				"uni-server-lnd", nil,
+			)
+
+			// We need to shut down any lnd nodes that were created
+			// for this test case.
+			t1.Cleanup(func() {
+				lndHarness.CleanShutDown()
+			})
+
+			// Wait for the new LND node to be fully synced to the
+			// blockchain.
+			lndHarness.WaitForBlockchainSync(uniServerLndHarness)
+
 			// 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, uniHarness, proofCourier := setupHarnesses(
 				t1, ht, lndHarness, uniServerLndHarness,
 				testCase.proofCourierType,
 			)
-			lndHarness.EnsureConnected(
-				lndHarness.Alice, lndHarness.Bob,
-			)
-			lndHarness.EnsureConnected(
-				lndHarness.Alice, uniServerLndHarness,
-			)
-			lndHarness.EnsureConnected(
-				lndHarness.Bob, uniServerLndHarness,
-			)
-
-			lndHarness.Alice.AddToLogf(logLine)
-			lndHarness.Bob.AddToLogf(logLine)
 
 			ht := ht.newHarnessTest(
 				t1, lndHarness, uniHarness, tapdHarness,

itest/mint_batch_stress_test.go

@@ -57,9 +57,8 @@ 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, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	bob := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, bob.stop(!*noDelete))
 	}()

itest/mint_fund_seal_test.go

@@ -42,8 +42,8 @@ func testMintFundSealAssets(t *harnessTest) {
 	// party in the test. This tapd node is connected to lnd "Bob".
 	var (
 		aliceTapd = t.tapd
-		aliceLnd  = t.lndHarness.Alice
-		bobLnd    = t.lndHarness.Bob
+		aliceLnd  = t.tapd.cfg.LndNode
+		bobLnd    = t.lndHarness.NewNodeWithCoins("Bob", nil)
 		bobTapd   = setupTapdHarness(t.t, t, bobLnd, t.universeServer)
 	)
 

itest/multi_asset_group_test.go

@@ -95,9 +95,8 @@ func testMintMultiAssetGroups(t *harnessTest) {
 
 	// Finally, we send some assets from the multi-asset group to Bob to
 	// ensure that they can be sent and received correctly.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()
@@ -329,9 +328,8 @@ func testMultiAssetGroupSend(t *harnessTest) {
 
 	// We'll make a second node now that'll be the receiver of all the
 	// assets made above.
-	secondTapd := setupTapdHarness(
-		t.t, t, t.lndHarness.Bob, t.universeServer,
-	)
+	lndBob := t.lndHarness.NewNodeWithCoins("Bob", nil)
+	secondTapd := setupTapdHarness(t.t, t, lndBob, t.universeServer)
 	defer func() {
 		require.NoError(t.t, secondTapd.stop(!*noDelete))
 	}()