GlcoinCore/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2026-08-13 12:32:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

lnwire_test: add createValidTLVExtraData

Browse source 
In this commit, we added createValidTLVExtraData which creates a
valid TLV data, and use it in place of createExtraData for messages
that their Encode or Decode requires validating the TLV data, which
were failing initially.
This commit is contained in:
Abdullahi Yunus 2026-03-05 12:12:43 +01:00
parent b2126c8440
commit 9d5fab9a32
No known key found for this signature in database
GPG key ID: 57B20938A9166F08
1 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

53
lnwire/message_test.go
View file

@ -16,6 +16,7 @@ import (
"github.com/btcsuite/btcd/btcec/v2/ecdsa"
"github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/tlv"
"github.com/lightningnetwork/lnd/tor"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
@ -308,13 +309,13 @@ func newMsgWarning(tb testing.TB, r io.Reader) *lnwire.Warning {
return msg
}
func newMsgInit(t testing.TB, r io.Reader) *lnwire.Init {
func newMsgInit(t testing.TB, r *rand.Rand) *lnwire.Init {
t.Helper()
return &lnwire.Init{
GlobalFeatures: rawFeatureVector(),
Features: rawFeatureVector(),
ExtraData: createExtraData(t, r),
ExtraData: createValidTLVExtraData(t, r),
}
}
@ -476,7 +477,7 @@ func newMsgShutdown(t testing.TB, r *rand.Rand) *lnwire.Shutdown {
msg := &lnwire.Shutdown{
Address: randDeliveryAddress(t, r),
ExtraData: createExtraData(t, r),
ExtraData: createValidTLVExtraData(t, r),
}
_, err := r.Read(msg.ChannelID[:])
@ -507,7 +508,7 @@ func newMsgUpdateAddHTLC(t testing.TB, r *rand.Rand) *lnwire.UpdateAddHTLC {
ID: r.Uint64(),
Amount: lnwire.MilliSatoshi(r.Int63()),
Expiry: r.Uint32(),
ExtraData: createExtraData(t, r),
ExtraData: createValidTLVExtraData(t, r),
}
_, err := r.Read(msg.ChanID[:])
@ -529,7 +530,7 @@ func newMsgUpdateFulfillHTLC(t testing.TB,
msg := &lnwire.UpdateFulfillHTLC{
ID: r.Uint64(),
ExtraData: createExtraData(t, r),
ExtraData: createValidTLVExtraData(t, r),
}
_, err := r.Read(msg.ChanID[:])
@ -555,7 +556,7 @@ func newMsgUpdateFailHTLC(t testing.TB, r *rand.Rand) *lnwire.UpdateFailHTLC {
return msg
}
func newMsgCommitSig(t testing.TB, r io.Reader) *lnwire.CommitSig {
func newMsgCommitSig(t testing.TB, r *rand.Rand) *lnwire.CommitSig {
t.Helper()
msg := lnwire.NewCommitSig()
@ -564,7 +565,7 @@ func newMsgCommitSig(t testing.TB, r io.Reader) *lnwire.CommitSig {
require.NoError(t, err, "unable to generate chan id")
msg.CommitSig = testNodeSig
msg.ExtraData = createExtraData(t, r)
msg.ExtraData = createValidTLVExtraData(t, r)
msg.HtlcSigs = make([]lnwire.Sig, testNumSigs)
for i := 0; i < testNumSigs; i++ {
@ -657,7 +658,7 @@ func newMsgChannelAnnouncement(t testing.TB,
NodeID2: randRawKey(t),
BitcoinKey1: randRawKey(t),
BitcoinKey2: randRawKey(t),
ExtraOpaqueData: createExtraData(t, r),
ExtraOpaqueData: createValidTLVExtraData(t, r),
NodeSig1: testNodeSig,
NodeSig2: testNodeSig,
BitcoinSig1: testNodeSig,
@ -686,7 +687,7 @@ func newMsgNodeAnnouncement(t testing.TB,
},
NodeID: randRawKey(t),
Addresses: randAddrs(t, r),
ExtraOpaqueData: createExtraData(t, r),
ExtraOpaqueData: createValidTLVExtraData(t, r),
Signature: testNodeSig,
}
@ -1064,3 +1065,37 @@ func createExtraData(t testing.TB, r io.Reader) []byte {
return extraData
}
// createValidTLVExtraData creates a valid, canonically-ordered TLV stream
// suitable for use as ExtraData in messages whose Encode methods re-parse
// ExtraData as TLV. Unlike createExtraData which generates raw random bytes,
// this produces properly encoded TLV records with monotonically increasing
// types.
func createValidTLVExtraData(t testing.TB, r *rand.Rand) []byte {
t.Helper()
// Generate between 1 and 4 TLV records with strictly increasing
// types and random values.
numRecords := r.Intn(4) + 1
records := make([]tlv.Record, 0, numRecords)
tlvType := tlv.Type(r.Intn(100) + 1)
for range numRecords {
val := make([]byte, r.Intn(20)+1)
_, err := r.Read(val)
require.NoError(t, err, "unable to generate tlv value")
records = append(
records, tlv.MakePrimitiveRecord(tlvType, &val),
)
// Ensure strictly increasing types.
tlvType += tlv.Type(r.Intn(100) + 1)
}
// Encode the records.
encoded, err := lnwire.EncodeRecords(records)
require.NoError(t, err, "unable to encode tlv records")
return encoded
}