lnwallet: add new TestChanSyncOweCommitmentAuxSigner test

This test ensures that when we go to retransmit a signature, we also include the set of CustomRecords.

Author: Roasbeef

lnwallet/channel_test.go

@@ -28,6 +28,7 @@ import (
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/tlv"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
@@ -3368,6 +3369,10 @@ func TestChanSyncOweCommitment(t *testing.T) {
 	}
 }
 
+type testSigBlob struct {
+	BlobInt tlv.RecordT[tlv.TlvType65634, uint16]
+}
+
 // TestChanSyncOweCommitmentAuxSigner tests that when one party owes a
 // signature after a channel reest, if an aux signer is present, then the
 // signature message sent includes the additional aux sigs as extra data.
@@ -3411,12 +3416,23 @@ func TestChanSyncOweCommitmentAuxSigner(t *testing.T) {
 
 	// We'll set up the mock to expect calls to PackSigs and also
 	// SubmitSubmitSecondLevelSigBatch.
-	sigBlobs := bytes.Repeat([]byte{0x01}, 64)
+	var sigBlobBuf bytes.Buffer
+	sigBlob := testSigBlob{
+		BlobInt: tlv.NewPrimitiveRecord[tlv.TlvType65634, uint16](5),
+	}
+	tlvStream, err := tlv.NewStream(sigBlob.BlobInt.Record())
+	require.NoError(t, err, "unable to create tlv stream")
+	require.NoError(t, tlvStream.Encode(&sigBlobBuf))
+
 	auxSigner.On(
 		"SubmitSecondLevelSigBatch", mock.Anything, mock.Anything,
 		mock.Anything,
 	).Return(nil).Twice()
-	auxSigner.On("PackSigs", mock.Anything).Return(fn.Some(sigBlobs), nil)
+	auxSigner.On(
+		"PackSigs", mock.Anything,
+	).Return(
+		fn.Some(sigBlobBuf.Bytes()), nil,
+	)
 
 	_, err = aliceChannel.SignNextCommitment()
 	require.NoError(t, err, "unable to sign commitment")
@@ -3443,10 +3459,8 @@ func TestChanSyncOweCommitmentAuxSigner(t *testing.T) {
 	require.True(t, ok)
 	require.True(t, sigMsg.PartialSig.IsSome())
 
-	// The signature should have the ExtraData field set.
-	require.NotNil(t, sigMsg.ExtraData)
-
-	// TODO(roasbeef): also make one for owe revocation
+	// The signature should have the CustomRecords field set.
+	require.NotEmpty(t, sigMsg.CustomRecords)
 }
 
 func testChanSyncOweCommitmentPendingRemote(t *testing.T,

lnwallet/mock.go

@@ -17,7 +17,11 @@ import (
 	"github.com/btcsuite/btcwallet/wallet/txauthor"
 	"github.com/btcsuite/btcwallet/wtxmgr"
 	"github.com/lightningnetwork/lnd/chainntnfs"
+	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
+	"github.com/lightningnetwork/lnd/tlv"
+	"github.com/stretchr/testify/mock"
 )
 
 var (
@@ -384,3 +388,46 @@ func (*mockChainIO) GetBlockHeader(
 
 	return nil, nil
 }
+
+type auxSignerMock struct {
+	mock.Mock
+}
+
+func (a *auxSignerMock) SubmitSecondLevelSigBatch(
+	chanState *channeldb.OpenChannel,
+	commitTx *wire.MsgTx, sigJobs []AuxSigJob) error {
+
+	args := a.Called(chanState, commitTx, sigJobs)
+
+	// While we return, we'll also send back an instant response for the
+	// set of jobs.
+	for _, sigJob := range sigJobs {
+		sigJob.Resp <- AuxSigJobResp{}
+	}
+
+	return args.Error(0)
+}
+
+func (a *auxSignerMock) PackSigs(sigs []fn.Option[tlv.Blob],
+) (fn.Option[tlv.Blob], error) {
+
+	args := a.Called(sigs)
+
+	return args.Get(0).(fn.Option[tlv.Blob]), args.Error(1)
+}
+
+func (a *auxSignerMock) UnpackSigs(sigs fn.Option[tlv.Blob]) (
+	[]fn.Option[tlv.Blob], error) {
+
+	args := a.Called(sigs)
+
+	return args.Get(0).([]fn.Option[tlv.Blob]), args.Error(1)
+}
+
+func (a *auxSignerMock) VerifySecondLevelSigs(chanState *channeldb.OpenChannel,
+	commitTx *wire.MsgTx, verifyJob []AuxVerifyJob) error {
+
+	args := a.Called(chanState, commitTx, verifyJob)
+
+	return args.Error(0)
+}