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

41.67

/macaroons/auth.go

package macaroons

import (
        "context"
        "encoding/hex"

        macaroon "gopkg.in/macaroon.v2"
)

// MacaroonCredential wraps a macaroon to implement the
// credentials.PerRPCCredentials interface.
type MacaroonCredential struct {
        *macaroon.Macaroon
}

// RequireTransportSecurity implements the PerRPCCredentials interface.
func (m MacaroonCredential) RequireTransportSecurity() bool {
        return true
}

// GetRequestMetadata implements the PerRPCCredentials interface. This method
// is required in order to pass the wrapped macaroon into the gRPC context.
// With this, the macaroon will be available within the request handling scope
// of the ultimate gRPC server implementation.
func (m MacaroonCredential) GetRequestMetadata(ctx context.Context,
        uri ...string) (map[string]string, error) {

        macBytes, err := m.MarshalBinary()
        if err != nil {
                return nil, err
        }

        md := make(map[string]string)
        md["macaroon"] = hex.EncodeToString(macBytes)
        return md, nil
}

// NewMacaroonCredential returns a copy of the passed macaroon wrapped in a
// MacaroonCredential struct which implements PerRPCCredentials.
func NewMacaroonCredential(m *macaroon.Macaroon) (MacaroonCredential, error) {
        ms := MacaroonCredential{}

        // The macaroon library's Clone() method has a subtle bug that doesn't
        // correctly clone all caveats. We need to use our own, safe clone
        // function instead.
        var err error
        ms.Macaroon, err = SafeCopyMacaroon(m)
        if err != nil {
                return ms, err
        }

        return ms, nil
}

1	package macaroons
2
3	import (
4	"context"
5	"encoding/hex"
6
7	macaroon "gopkg.in/macaroon.v2"
8	)
9
10	// MacaroonCredential wraps a macaroon to implement the
11	// credentials.PerRPCCredentials interface.
12	type MacaroonCredential struct {
13	*macaroon.Macaroon
14	}
15
16	// RequireTransportSecurity implements the PerRPCCredentials interface.
UNCOV 17	func (m MacaroonCredential) RequireTransportSecurity() bool {	×
UNCOV 18	return true	×
UNCOV 19	}	×
20
21	// GetRequestMetadata implements the PerRPCCredentials interface. This method
22	// is required in order to pass the wrapped macaroon into the gRPC context.
23	// With this, the macaroon will be available within the request handling scope
24	// of the ultimate gRPC server implementation.
25	func (m MacaroonCredential) GetRequestMetadata(ctx context.Context,
UNCOV 26	uri ...string) (map[string]string, error) {	×
UNCOV 27		×
UNCOV 28	macBytes, err := m.MarshalBinary()	×
UNCOV 29	if err != nil {	×
30	return nil, err	×
31	}	×
32
UNCOV 33	md := make(map[string]string)	×
UNCOV 34	md["macaroon"] = hex.EncodeToString(macBytes)	×
UNCOV 35	return md, nil	×
36	}
37
38	// NewMacaroonCredential returns a copy of the passed macaroon wrapped in a
39	// MacaroonCredential struct which implements PerRPCCredentials.
40	func NewMacaroonCredential(m *macaroon.Macaroon) (MacaroonCredential, error) {	1✔
41	ms := MacaroonCredential{}	1✔
42		1✔
43	// The macaroon library's Clone() method has a subtle bug that doesn't	1✔
44	// correctly clone all caveats. We need to use our own, safe clone	1✔
45	// function instead.	1✔
46	var err error	1✔
47	ms.Macaroon, err = SafeCopyMacaroon(m)	1✔
48	if err != nil {	1✔
49	return ms, err	×
50	}	×
51
52	return ms, nil	1✔
53	}

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