13536249039

Committed 26 Feb 2025 03:42AM UTC coverage: 57.462% (-1.4%) from 58.835%

Build # 13536249039

Build Type

Pull #8453

github

Committed by

Roasbeef

Commit Message

peer: update chooseDeliveryScript to gen script if needed

In this commit, we update `chooseDeliveryScript` to generate a new
script if needed. This allows us to fold in a few other lines that
always followed this function into this expanded function.

The tests have been updated accordingly.

Pull Request Pull Request #8453: [4/4] - multi: integrate new rbf coop close FSM into the existing peer flow

Run Details

275 of 1318 new or added lines in 22 files covered. (20.86%)

19521 existing lines in 257 files now uncovered.

103858 of 180741 relevant lines covered (57.46%)

24750.23 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.0

/record/mpp.go

package record

import (
        "fmt"
        "io"

        "github.com/lightningnetwork/lnd/lnwire"
        "github.com/lightningnetwork/lnd/tlv"
)

// MPPOnionType is the type used in the onion to reference the MPP fields:
// total_amt and payment_addr.
const MPPOnionType tlv.Type = 8

// MPP is a record that encodes the fields necessary for multi-path payments.
type MPP struct {
        // paymentAddr is a random, receiver-generated value used to avoid
        // collisions with concurrent payers.
        paymentAddr [32]byte

        // totalMsat is the total value of the payment, potentially spread
        // across more than one HTLC.
        totalMsat lnwire.MilliSatoshi
}

// NewMPP generates a new MPP record with the given total and payment address.
func NewMPP(total lnwire.MilliSatoshi, addr [32]byte) *MPP {
        return &MPP{
                paymentAddr: addr,
                totalMsat:   total,
        }
}

// PaymentAddr returns the payment address contained in the MPP record.
func (r *MPP) PaymentAddr() [32]byte {
        return r.paymentAddr
}

// TotalMsat returns the total value of an MPP payment in msats.
func (r *MPP) TotalMsat() lnwire.MilliSatoshi {
        return r.totalMsat
}

// MPPEncoder writes the MPP record to the provided io.Writer.
func MPPEncoder(w io.Writer, val interface{}, buf *[8]byte) error {
        if v, ok := val.(*MPP); ok {
                err := tlv.EBytes32(w, &v.paymentAddr, buf)
                if err != nil {
                        return err
                }

                return tlv.ETUint64T(w, uint64(v.totalMsat), buf)
        }
        return tlv.NewTypeForEncodingErr(val, "MPP")
}

const (
        // minMPPLength is the minimum length of a serialized MPP TLV record,
        // which occurs when the truncated encoding of total_amt_msat takes 0
        // bytes, leaving only the payment_addr.
        minMPPLength = 32

        // maxMPPLength is the maximum length of a serialized MPP TLV record,
        // which occurs when the truncated encoding of total_amt_msat takes 8
        // bytes.
        maxMPPLength = 40
)

// MPPDecoder reads the MPP record to the provided io.Reader.
func MPPDecoder(r io.Reader, val interface{}, buf *[8]byte, l uint64) error {
        if v, ok := val.(*MPP); ok && minMPPLength <= l && l <= maxMPPLength {
                if err := tlv.DBytes32(r, &v.paymentAddr, buf, 32); err != nil {
                        return err
                }

                var total uint64
                if err := tlv.DTUint64(r, &total, buf, l-32); err != nil {
                        return err
                }
                v.totalMsat = lnwire.MilliSatoshi(total)

                return nil
        }
        return tlv.NewTypeForDecodingErr(val, "MPP", l, maxMPPLength)
}

// Record returns a tlv.Record that can be used to encode or decode this record.
func (r *MPP) Record() tlv.Record {
        // Fixed-size, 32 byte payment address followed by truncated 64-bit
        // total msat.
        size := func() uint64 {
                return 32 + tlv.SizeTUint64(uint64(r.totalMsat))
        }

        return tlv.MakeDynamicRecord(
                MPPOnionType, r, size, MPPEncoder, MPPDecoder,
        )
}

// PayloadSize returns the size this record takes up in encoded form.
func (r *MPP) PayloadSize() uint64 {
        return 32 + tlv.SizeTUint64(uint64(r.totalMsat))
}

// String returns a human-readable representation of the mpp payload field.
func (r *MPP) String() string {
        if r == nil {
                return "<nil>"
        }

        return fmt.Sprintf("total=%v, addr=%x", r.totalMsat, r.paymentAddr)
}

1	package record
2
3	import (
4	"fmt"
5	"io"
6
7	"github.com/lightningnetwork/lnd/lnwire"
8	"github.com/lightningnetwork/lnd/tlv"
9	)
10
11	// MPPOnionType is the type used in the onion to reference the MPP fields:
12	// total_amt and payment_addr.
13	const MPPOnionType tlv.Type = 8
14
15	// MPP is a record that encodes the fields necessary for multi-path payments.
16	type MPP struct {
17	// paymentAddr is a random, receiver-generated value used to avoid
18	// collisions with concurrent payers.
19	paymentAddr [32]byte
20
21	// totalMsat is the total value of the payment, potentially spread
22	// across more than one HTLC.
23	totalMsat lnwire.MilliSatoshi
24	}
25
26	// NewMPP generates a new MPP record with the given total and payment address.
27	func NewMPP(total lnwire.MilliSatoshi, addr [32]byte) *MPP {	498✔
28	return &MPP{	498✔
29	paymentAddr: addr,	498✔
30	totalMsat: total,	498✔
31	}	498✔
32	}	498✔
33
34	// PaymentAddr returns the payment address contained in the MPP record.
35	func (r *MPP) PaymentAddr() [32]byte {	2,484✔
36	return r.paymentAddr	2,484✔
37	}	2,484✔
38
39	// TotalMsat returns the total value of an MPP payment in msats.
40	func (r *MPP) TotalMsat() lnwire.MilliSatoshi {	799✔
41	return r.totalMsat	799✔
42	}	799✔
43
44	// MPPEncoder writes the MPP record to the provided io.Writer.
45	func MPPEncoder(w io.Writer, val interface{}, buf *[8]byte) error {	233✔
46	if v, ok := val.(*MPP); ok {	466✔
47	err := tlv.EBytes32(w, &v.paymentAddr, buf)	233✔
48	if err != nil {	233✔
49	return err	×
50	}	×
51
52	return tlv.ETUint64T(w, uint64(v.totalMsat), buf)	233✔
53	}
54	return tlv.NewTypeForEncodingErr(val, "MPP")	×
55	}
56
57	const (
58	// minMPPLength is the minimum length of a serialized MPP TLV record,
59	// which occurs when the truncated encoding of total_amt_msat takes 0
60	// bytes, leaving only the payment_addr.
61	minMPPLength = 32
62
63	// maxMPPLength is the maximum length of a serialized MPP TLV record,
64	// which occurs when the truncated encoding of total_amt_msat takes 8
65	// bytes.
66	maxMPPLength = 40
67	)
68
69	// MPPDecoder reads the MPP record to the provided io.Reader.
70	func MPPDecoder(r io.Reader, val interface{}, buf *[8]byte, l uint64) error {	676✔
71	if v, ok := val.(*MPP); ok && minMPPLength <= l && l <= maxMPPLength {	1,352✔
72	if err := tlv.DBytes32(r, &v.paymentAddr, buf, 32); err != nil {	676✔
73	return err	×
74	}	×
75
76	var total uint64	676✔
77	if err := tlv.DTUint64(r, &total, buf, l-32); err != nil {	676✔
78	return err	×
79	}	×
80	v.totalMsat = lnwire.MilliSatoshi(total)	676✔
81		676✔
82	return nil	676✔
83	}
84	return tlv.NewTypeForDecodingErr(val, "MPP", l, maxMPPLength)	×
85	}
86
87	// Record returns a tlv.Record that can be used to encode or decode this record.
88	func (r *MPP) Record() tlv.Record {	959✔
89	// Fixed-size, 32 byte payment address followed by truncated 64-bit	959✔
90	// total msat.	959✔
91	size := func() uint64 {	1,128✔
92	return 32 + tlv.SizeTUint64(uint64(r.totalMsat))	169✔
93	}	169✔
94
95	return tlv.MakeDynamicRecord(	959✔
96	MPPOnionType, r, size, MPPEncoder, MPPDecoder,	959✔
97	)	959✔
98	}
99
100	// PayloadSize returns the size this record takes up in encoded form.
101	func (r *MPP) PayloadSize() uint64 {	52✔
102	return 32 + tlv.SizeTUint64(uint64(r.totalMsat))	52✔
103	}	52✔
104
105	// String returns a human-readable representation of the mpp payload field.
106	func (r *MPP) String() string {	1✔
107	if r == nil {	1✔
UNCOV 108	return "<nil>"	×
UNCOV 109	}	×
110
111	return fmt.Sprintf("total=%v, addr=%x", r.totalMsat, r.paymentAddr)	1✔
112	}

lightningnetwork / lnd / 13536249039

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous