itest: fix naming and other small issues

Author: guggero

itest/psbt_test.go

@@ -2170,16 +2170,16 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 
 	// Now we need to create the bitcoin PSBT where the previously created
 	// vPSBT will be anchored to.
-	btcpsbt, err := tapsend.PrepareAnchoringTemplate([]*tappsbt.VPacket{
+	btcPacket, err := tapsend.PrepareAnchoringTemplate([]*tappsbt.VPacket{
 		vPkt,
 	})
 	require.NoError(t.t, err)
 
 	// This bitcoin PSBT should have 1 input, which is the anchor of Alice's
 	// assets, and 2 outputs that correspond to Alice's bitcoin change
 	// (index 0) and the anchor that carries the assets (index 1).
-	require.Len(t.t, btcpsbt.Inputs, 1)
-	require.Len(t.t, btcpsbt.Outputs, 2)
+	require.Len(t.t, btcPacket.Inputs, 1)
+	require.Len(t.t, btcPacket.Outputs, 2)
 
 	// Let's set an actual address for Alice's output.
 	addrResp := t.lndHarness.Alice.RPC.NewAddress(&lnrpc.NewAddressRequest{
@@ -2197,23 +2197,22 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	// These are basically Alice's terms that she signs the assets over:
 	// Send me 69420 satoshis to this address that belongs to me, and you
 	// will get assets in return.
-	btcpsbt.UnsignedTx.TxOut[0].PkScript = alicePkScript
-	btcpsbt.UnsignedTx.TxOut[0].Value = 69420
+	btcPacket.UnsignedTx.TxOut[0].PkScript = alicePkScript
+	btcPacket.UnsignedTx.TxOut[0].Value = 69420
 	derivation, trDerivation := getAddressBip32Derivation(
 		t.t, addrResp.Address, t.lndHarness.Alice,
 	)
 
 	// Add the derivation info and internal key for alice's taproot address.
-	btcpsbt.Outputs[0].Bip32Derivation = []*psbt.Bip32Derivation{
+	btcPacket.Outputs[0].Bip32Derivation = []*psbt.Bip32Derivation{
 		derivation,
 	}
-	btcpsbt.Outputs[0].TaprootBip32Derivation = []*psbt.TaprootBip32Derivation{
-		trDerivation,
-	}
-	btcpsbt.Outputs[0].TaprootInternalKey = trDerivation.XOnlyPubKey
+	btcPacket.Outputs[0].TaprootBip32Derivation =
+		[]*psbt.TaprootBip32Derivation{trDerivation}
+	btcPacket.Outputs[0].TaprootInternalKey = trDerivation.XOnlyPubKey
 
 	var b bytes.Buffer
-	err = btcpsbt.Serialize(&b)
+	err = btcPacket.Serialize(&b)
 	require.NoError(t.t, err)
 
 	// Now we need to commit the vPSBT and PSBT, creating all the related
@@ -2233,7 +2232,7 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	require.NoError(t.t, err)
 
 	// Now we retrieve the bitcoin PSBT from the response.
-	btcpsbt, err = psbt.NewFromRawBytes(
+	btcPacket, err = psbt.NewFromRawBytes(
 		bytes.NewReader(resp.AnchorPsbt), false,
 	)
 	require.NoError(t.t, err)
@@ -2244,27 +2243,27 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	// following sighash flag we commit to exactly that input and output,
 	// but we also allow anyone to add their own inputs, which will allow
 	// Bob later to add his btc input to pay Alice.
-	btcpsbt.Inputs[0].SighashType = txscript.SigHashSingle |
+	btcPacket.Inputs[0].SighashType = txscript.SigHashSingle |
 		txscript.SigHashAnyOneCanPay
 
 	// We now strip the extra input that was only used to fund the bitcoin
 	// psbt. This is meant to be filled later by the person redeeming this
 	// swap offer.
-	btcpsbt.Inputs = append(
-		btcpsbt.Inputs[:1], btcpsbt.Inputs[2:]...,
+	btcPacket.Inputs = append(
+		btcPacket.Inputs[:1], btcPacket.Inputs[2:]...,
 	)
-	btcpsbt.UnsignedTx.TxIn = append(
-		btcpsbt.UnsignedTx.TxIn[:1], btcpsbt.UnsignedTx.TxIn[2:]...,
+	btcPacket.UnsignedTx.TxIn = append(
+		btcPacket.UnsignedTx.TxIn[:1], btcPacket.UnsignedTx.TxIn[2:]...,
 	)
 
 	// Let's get rid of the change output that we no longer need.
-	btcpsbt.Outputs = btcpsbt.Outputs[:2]
-	btcpsbt.UnsignedTx.TxOut = btcpsbt.UnsignedTx.TxOut[:2]
+	btcPacket.Outputs = btcPacket.Outputs[:2]
+	btcPacket.UnsignedTx.TxOut = btcPacket.UnsignedTx.TxOut[:2]
 
-	t.Logf("Alice BTC PSBT: %v", spew.Sdump(btcpsbt))
+	t.Logf("Alice BTC PSBT: %v", spew.Sdump(btcPacket))
 
 	b.Reset()
-	err = btcpsbt.Serialize(&b)
+	err = btcPacket.Serialize(&b)
 	require.NoError(t.t, err)
 
 	// Now alice signs the bitcoin psbt.
@@ -2277,14 +2276,14 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	require.Len(t.t, signPsbtResp.SignedInputs, 1)
 	require.Equal(t.t, uint32(0), signPsbtResp.SignedInputs[0])
 
-	btcpsbt, err = psbt.NewFromRawBytes(
+	btcPacket, err = psbt.NewFromRawBytes(
 		bytes.NewReader(signPsbtResp.SignedPsbt), false,
 	)
 	require.NoError(t.t, err)
 
 	// Let's do some sanity checks.
-	require.Len(t.t, btcpsbt.Inputs, 1)
-	require.Len(t.t, btcpsbt.Outputs, 2)
+	require.Len(t.t, btcPacket.Inputs, 1)
+	require.Len(t.t, btcPacket.Outputs, 2)
 
 	signedVpsbtBytes, err := tappsbt.Encode(vPkt)
 	require.NoError(t.t, err)
@@ -2327,11 +2326,12 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	// needs to be updated to point to Bob's keys as well. Otherwise, he
 	// wouldn't be able to take over custody of the anchor carrying the
 	// assets.
-	btcpsbt.Outputs[1].TaprootInternalKey = schnorr.SerializePubKey(
+	btcPacket.Outputs[1].TaprootInternalKey = schnorr.SerializePubKey(
 		bobAnchorInternalKey.PubKey,
 	)
-	btcpsbt.Outputs[1].Bip32Derivation = bobVOut.AnchorOutputBip32Derivation
-	btcpsbt.Outputs[1].TaprootBip32Derivation =
+	btcPacket.Outputs[1].Bip32Derivation =
+		bobVOut.AnchorOutputBip32Derivation
+	btcPacket.Outputs[1].TaprootBip32Derivation =
 		bobVOut.AnchorOutputTaprootBip32Derivation
 
 	// Before Bob tidies up the output commitments he keeps a backup of the
@@ -2358,7 +2358,7 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 	// Now let's serialize the edited vPSBT and commit it to our bitcoin
 	// PSBT.
 	b.Reset()
-	err = btcpsbt.Serialize(&b)
+	err = btcPacket.Serialize(&b)
 	require.NoError(t.t, err)
 
 	// This call will also fund the PSBT, which means that the bitcoin that
@@ -2383,7 +2383,7 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 
 	// Since Bob brings in a new input to the bitcoin transaction, he needs
 	// to sign it. We do not care about the sighash flag here, that can be
-	// the default, as as we will not edit the bitcoin transaction further.
+	// the default, as we will not edit the bitcoin transaction further.
 	signResp := t.lndHarness.Bob.RPC.SignPsbt(
 		&walletrpc.SignPsbtRequest{
 			FundedPsbt: resp.AnchorPsbt,
@@ -2405,6 +2405,7 @@ func testPsbtTrustlessSwap(t *harnessTest) {
 
 	// Bob should sign exactly 1 input.
 	require.Len(t.t, signResp.SignedInputs, 1)
+
 	// Bob should have signed the input at the expected index.
 	require.Equal(t.t, bobInputIdx, signResp.SignedInputs[0])
 	require.NoError(t.t, finalPsbt.SanityCheck())