highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-04-09 20:49:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

blindedpath: remove a context.TODO

Browse Source
This commit is contained in:
Elle Mouton 2024-11-13 10:25:57 +02:00
parent dcfffd6bda
commit 75b1069a08
No known key found for this signature in database
GPG Key ID: D7D916376026F177
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lnrpc/invoicesrpc/addinvoice.go
View File

@ -521,7 +521,7 @@ func AddInvoice(ctx context.Context, cfg *AddInvoiceConfig,
//nolint:lll
paths, err := blindedpath.BuildBlindedPaymentPaths(
&blindedpath.BuildBlindedPathCfg{
ctx, &blindedpath.BuildBlindedPathCfg{
FindRoutes: cfg.QueryBlindedRoutes,
FetchChannelEdgesByID: cfg.Graph.FetchChannelEdgesByID,
FetchOurOpenChannels: cfg.ChanDB.FetchAllOpenChannels,

25
routing/blindedpath/blinded_path.go
View File

@ -113,7 +113,7 @@ type BuildBlindedPathCfg struct {
// BuildBlindedPaymentPaths uses the passed config to construct a set of blinded
// payment paths that can be added to the invoice.
func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) (
func BuildBlindedPaymentPaths(ctx context.Context, cfg *BuildBlindedPathCfg) (
[]*zpay32.BlindedPaymentPath, error) {
// Find some appropriate routes for the value to be routed. This will
@ -143,7 +143,7 @@ func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) (
// of hops is met.
candidatePath.padWithDummyHops(cfg.MinNumHops)
path, err := buildBlindedPaymentPath(cfg, candidatePath)
path, err := buildBlindedPaymentPath(ctx, cfg, candidatePath)
if errors.Is(err, errInvalidBlindedPath) {
log.Debugf("Not using route (%s) as a blinded path "+
"since it resulted in an invalid blinded path",
@ -171,10 +171,10 @@ func BuildBlindedPaymentPaths(cfg *BuildBlindedPathCfg) (
// buildBlindedPaymentPath takes a route from an introduction node to this node
// and uses the given config to convert it into a blinded payment path.
func buildBlindedPaymentPath(cfg *BuildBlindedPathCfg, path *candidatePath) (
*zpay32.BlindedPaymentPath, error) {
func buildBlindedPaymentPath(ctx context.Context, cfg *BuildBlindedPathCfg,
path *candidatePath) (*zpay32.BlindedPaymentPath, error) {
hops, minHTLC, maxHTLC, err := collectRelayInfo(cfg, path)
hops, minHTLC, maxHTLC, err := collectRelayInfo(ctx, cfg, path)
if err != nil {
return nil, fmt.Errorf("could not collect blinded path relay "+
"info: %w", err)
@ -355,8 +355,9 @@ type hopRelayInfo struct {
// policy values. If there are no real hops (in other words we are the
// introduction node), then we use some default routing values and we use the
// average of our channel capacities for the MaxHTLC value.
func collectRelayInfo(cfg *BuildBlindedPathCfg, path *candidatePath) (
[]*hopRelayInfo, lnwire.MilliSatoshi, lnwire.MilliSatoshi, error) {
func collectRelayInfo(ctx context.Context, cfg *BuildBlindedPathCfg,
path *candidatePath) ([]*hopRelayInfo, lnwire.MilliSatoshi,
lnwire.MilliSatoshi, error) {
var (
// The first pub key is that of the introduction node.
@ -383,7 +384,7 @@ func collectRelayInfo(cfg *BuildBlindedPathCfg, path *candidatePath) (
// channel ID in the direction pointing away from the hopSource
// node.
policy, err := getNodeChannelPolicy(
cfg, hop.channelID, hopSource,
ctx, cfg, hop.channelID, hopSource,
)
if err != nil {
return nil, 0, 0, err
@ -640,14 +641,12 @@ func buildFinalHopRouteData(node route.Vertex, pathID []byte,
// getNodeChanPolicy fetches the routing policy info for the given channel and
// node pair.
func getNodeChannelPolicy(cfg *BuildBlindedPathCfg, chanID uint64,
nodeID route.Vertex) (*BlindedHopPolicy, error) {
func getNodeChannelPolicy(ctx context.Context, cfg *BuildBlindedPathCfg,
chanID uint64, nodeID route.Vertex) (*BlindedHopPolicy, error) {
// Attempt to fetch channel updates for the given channel. We will have
// at most two updates for a given channel.
_, update1, update2, err := cfg.FetchChannelEdgesByID(
context.TODO(), chanID,
)
_, update1, update2, err := cfg.FetchChannelEdgesByID(ctx, chanID)
if err != nil {
return nil, err
}

13
routing/blindedpath/blinded_path_test.go
View File

@ -549,6 +549,8 @@ func genBlindedRouteData(rand *rand.Rand) *record.BlindedRouteData {
// https://github.com/lightning/bolts/blob/master/proposals/route-blinding.md
// This example does not use any dummy hops.
func TestBuildBlindedPath(t *testing.T) {
ctx := context.Background()
// Alice chooses the following path to herself for blinded path
// construction:
// Carol -> Bob -> Alice.
@ -592,7 +594,7 @@ func TestBuildBlindedPath(t *testing.T) {
},
}
paths, err := BuildBlindedPaymentPaths(&BuildBlindedPathCfg{
paths, err := BuildBlindedPaymentPaths(ctx, &BuildBlindedPathCfg{
FindRoutes: func(_ lnwire.MilliSatoshi) ([]*route.Route,
error) {
@ -717,6 +719,8 @@ func TestBuildBlindedPath(t *testing.T) {
// TestBuildBlindedPathWithDummyHops tests the construction of a blinded path
// which includes dummy hops.
func TestBuildBlindedPathWithDummyHops(t *testing.T) {
ctx := context.Background()
// Alice chooses the following path to herself for blinded path
// construction:
// Carol -> Bob -> Alice.
@ -760,7 +764,7 @@ func TestBuildBlindedPathWithDummyHops(t *testing.T) {
},
}
paths, err := BuildBlindedPaymentPaths(&BuildBlindedPathCfg{
paths, err := BuildBlindedPaymentPaths(ctx, &BuildBlindedPathCfg{
FindRoutes: func(_ lnwire.MilliSatoshi) ([]*route.Route,
error) {
@ -930,7 +934,7 @@ func TestBuildBlindedPathWithDummyHops(t *testing.T) {
// the first 2 calls. FindRoutes returns 3 routes and so by the end, we
// still get 1 valid path.
var errCount int
paths, err = BuildBlindedPaymentPaths(&BuildBlindedPathCfg{
paths, err = BuildBlindedPaymentPaths(ctx, &BuildBlindedPathCfg{
FindRoutes: func(_ lnwire.MilliSatoshi) ([]*route.Route,
error) {
@ -999,6 +1003,7 @@ func TestBuildBlindedPathWithDummyHops(t *testing.T) {
// node.
func TestSingleHopBlindedPath(t *testing.T) {
var (
ctx = context.Background()
_, pkC = btcec.PrivKeyFromBytes([]byte{1})
carol = route.NewVertex(pkC)
)
@ -1010,7 +1015,7 @@ func TestSingleHopBlindedPath(t *testing.T) {
Hops: []*route.Hop{},
}
paths, err := BuildBlindedPaymentPaths(&BuildBlindedPathCfg{
paths, err := BuildBlindedPaymentPaths(ctx, &BuildBlindedPathCfg{
FindRoutes: func(_ lnwire.MilliSatoshi) ([]*route.Route,
error) {