Skip to content

Commit 8347bc2

Browse files
committed
lnwire: simplify dyn decode methods
Remove the unnecessary convertions as suggested by Gemini.
1 parent d2c980d commit 8347bc2

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

lnwire/dyn_commit.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,16 @@ func (dc *DynCommit) Decode(r io.Reader, _ uint32) error {
110110
// Check the results of the TLV Stream decoding and appropriately set
111111
// message fields.
112112
if _, ok := knownRecords[dc.DustLimit.TlvType()]; ok {
113-
var rec tlv.RecordT[tlv.TlvType0, tlv.BigSizeT[btcutil.Amount]]
114-
rec.Val = dustLimit.Val
115-
dc.DustLimit = tlv.SomeRecordT(rec)
113+
dc.DustLimit = tlv.SomeRecordT(dustLimit)
116114
}
117115
if _, ok := knownRecords[dc.MaxValueInFlight.TlvType()]; ok {
118-
var rec tlv.RecordT[tlv.TlvType2, MilliSatoshi]
119-
rec.Val = maxValue.Val
120-
dc.MaxValueInFlight = tlv.SomeRecordT(rec)
116+
dc.MaxValueInFlight = tlv.SomeRecordT(maxValue)
121117
}
122118
if _, ok := knownRecords[dc.HtlcMinimum.TlvType()]; ok {
123-
var rec tlv.RecordT[tlv.TlvType4, MilliSatoshi]
124-
rec.Val = htlcMin.Val
125-
dc.HtlcMinimum = tlv.SomeRecordT(rec)
119+
dc.HtlcMinimum = tlv.SomeRecordT(htlcMin)
126120
}
127121
if _, ok := knownRecords[dc.ChannelReserve.TlvType()]; ok {
128-
var rec tlv.RecordT[tlv.TlvType6, tlv.BigSizeT[btcutil.Amount]]
129-
rec.Val = reserve.Val
130-
dc.ChannelReserve = tlv.SomeRecordT(rec)
122+
dc.ChannelReserve = tlv.SomeRecordT(reserve)
131123
}
132124
if _, ok := knownRecords[dc.CsvDelay.TlvType()]; ok {
133125
dc.CsvDelay = tlv.SomeRecordT(csvDelay)

lnwire/dyn_propose.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,19 @@ func (dp *DynPropose) Decode(r io.Reader, _ uint32) error {
131131
// Check the results of the TLV Stream decoding and appropriately set
132132
// message fields.
133133
if _, ok := knownRecords[dp.DustLimit.TlvType()]; ok {
134-
var rec tlv.RecordT[tlv.TlvType0, tlv.BigSizeT[btcutil.Amount]]
135-
rec.Val = dustLimit.Val
136-
dp.DustLimit = tlv.SomeRecordT(rec)
134+
dp.DustLimit = tlv.SomeRecordT(dustLimit)
137135
}
138136

139137
if _, ok := knownRecords[dp.MaxValueInFlight.TlvType()]; ok {
140-
var rec tlv.RecordT[tlv.TlvType2, MilliSatoshi]
141-
rec.Val = maxValue.Val
142-
dp.MaxValueInFlight = tlv.SomeRecordT(rec)
138+
dp.MaxValueInFlight = tlv.SomeRecordT(maxValue)
143139
}
144140

145141
if _, ok := knownRecords[dp.HtlcMinimum.TlvType()]; ok {
146-
var rec tlv.RecordT[tlv.TlvType4, MilliSatoshi]
147-
rec.Val = htlcMin.Val
148-
dp.HtlcMinimum = tlv.SomeRecordT(rec)
142+
dp.HtlcMinimum = tlv.SomeRecordT(htlcMin)
149143
}
150144

151145
if _, ok := knownRecords[dp.ChannelReserve.TlvType()]; ok {
152-
var rec tlv.RecordT[tlv.TlvType6, tlv.BigSizeT[btcutil.Amount]]
153-
rec.Val = reserve.Val
154-
dp.ChannelReserve = tlv.SomeRecordT(rec)
146+
dp.ChannelReserve = tlv.SomeRecordT(reserve)
155147
}
156148

157149
if _, ok := knownRecords[dp.CsvDelay.TlvType()]; ok {

0 commit comments

Comments
 (0)