14351709291

Committed 09 Apr 2025 07:39AM UTC coverage: 58.609%. First build

Build # 14351709291

Build Type

Pull #9691

github

Committed by

web-flow

Commit Message

Merge defcae152 into ac052988c

Pull Request Pull Request #9691: htlcswitch+peer: thread context through in preparation for passing to graph DB calls

Run Details

193 of 265 new or added lines in 15 files covered. (72.83%)

97159 of 165774 relevant lines covered (58.61%)

1.82 hits per line

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

80.43

/htlcswitch/held_htlc_set.go

package htlcswitch

import (
        "context"
        "errors"
        "fmt"

        "github.com/lightningnetwork/lnd/graph/db/models"
)

// heldHtlcSet keeps track of outstanding intercepted forwards. It exposes
// several methods to manipulate the underlying map structure in a consistent
// way.
type heldHtlcSet struct {
        set map[models.CircuitKey]InterceptedForward
}

func newHeldHtlcSet() *heldHtlcSet {
        return &heldHtlcSet{
                set: make(map[models.CircuitKey]InterceptedForward),
        }
}

// forEach iterates over all held forwards and calls the given callback for each
// of them.
func (h *heldHtlcSet) forEach(cb func(InterceptedForward)) {
        for _, fwd := range h.set {
                cb(fwd)
        }
}

// popAll calls the callback for each forward and removes them from the set.
func (h *heldHtlcSet) popAll(cb func(InterceptedForward)) {
        for _, fwd := range h.set {
                cb(fwd)
        }

        h.set = make(map[models.CircuitKey]InterceptedForward)
}

// popAutoFails calls the callback for each forward that has an auto-fail height
// equal or less then the specified pop height and removes them from the set.
func (h *heldHtlcSet) popAutoFails(ctx context.Context, height uint32,
        cb func(context.Context, InterceptedForward)) {

        for key, fwd := range h.set {
                if uint32(fwd.Packet().AutoFailHeight) > height {
                        continue
                }

                cb(ctx, fwd)

                delete(h.set, key)
        }
}

// pop returns the specified forward and removes it from the set.
func (h *heldHtlcSet) pop(key models.CircuitKey) (InterceptedForward, error) {
        intercepted, ok := h.set[key]
        if !ok {
                return nil, fmt.Errorf("fwd %v not found", key)
        }

        delete(h.set, key)

        return intercepted, nil
}

// exists tests whether the specified forward is part of the set.
func (h *heldHtlcSet) exists(key models.CircuitKey) bool {
        _, ok := h.set[key]

        return ok
}

// push adds the specified forward to the set. An error is returned if the
// forward exists already.
func (h *heldHtlcSet) push(key models.CircuitKey,
        fwd InterceptedForward) error {

        if fwd == nil {
                return errors.New("nil fwd pushed")
        }

        if h.exists(key) {
                return errors.New("htlc already exists in set")
        }

        h.set[key] = fwd

        return nil
}

1	package htlcswitch
2
3	import (
4	"context"
5	"errors"
6	"fmt"
7
8	"github.com/lightningnetwork/lnd/graph/db/models"
9	)
10
11	// heldHtlcSet keeps track of outstanding intercepted forwards. It exposes
12	// several methods to manipulate the underlying map structure in a consistent
13	// way.
14	type heldHtlcSet struct {
15	set map[models.CircuitKey]InterceptedForward
16	}
17
18	func newHeldHtlcSet() *heldHtlcSet {	3✔
19	return &heldHtlcSet{	3✔
20	set: make(map[models.CircuitKey]InterceptedForward),	3✔
21	}	3✔
22	}	3✔
23
24	// forEach iterates over all held forwards and calls the given callback for each
25	// of them.
26	func (h *heldHtlcSet) forEach(cb func(InterceptedForward)) {	3✔
27	for _, fwd := range h.set {	6✔
28	cb(fwd)	3✔
29	}	3✔
30	}
31
32	// popAll calls the callback for each forward and removes them from the set.
33	func (h *heldHtlcSet) popAll(cb func(InterceptedForward)) {	3✔
34	for _, fwd := range h.set {	6✔
35	cb(fwd)	3✔
36	}	3✔
37
38	h.set = make(map[models.CircuitKey]InterceptedForward)	3✔
39	}
40
41	// popAutoFails calls the callback for each forward that has an auto-fail height
42	// equal or less then the specified pop height and removes them from the set.
43	func (h *heldHtlcSet) popAutoFails(ctx context.Context, height uint32,
44	cb func(context.Context, InterceptedForward)) {	3✔
45		3✔
46	for key, fwd := range h.set {	6✔
47	if uint32(fwd.Packet().AutoFailHeight) > height {	6✔
48	continue	3✔
49	}
50
NEW 51	cb(ctx, fwd)	×
52		×
53	delete(h.set, key)	×
54	}
55	}
56
57	// pop returns the specified forward and removes it from the set.
58	func (h *heldHtlcSet) pop(key models.CircuitKey) (InterceptedForward, error) {	3✔
59	intercepted, ok := h.set[key]	3✔
60	if !ok {	3✔
61	return nil, fmt.Errorf("fwd %v not found", key)	×
62	}	×
63
64	delete(h.set, key)	3✔
65		3✔
66	return intercepted, nil	3✔
67	}
68
69	// exists tests whether the specified forward is part of the set.
70	func (h *heldHtlcSet) exists(key models.CircuitKey) bool {	3✔
71	_, ok := h.set[key]	3✔
72		3✔
73	return ok	3✔
74	}	3✔
75
76	// push adds the specified forward to the set. An error is returned if the
77	// forward exists already.
78	func (h *heldHtlcSet) push(key models.CircuitKey,
79	fwd InterceptedForward) error {	3✔
80		3✔
81	if fwd == nil {	3✔
82	return errors.New("nil fwd pushed")	×
83	}	×
84
85	if h.exists(key) {	3✔
86	return errors.New("htlc already exists in set")	×
87	}	×
88
89	h.set[key] = fwd	3✔
90		3✔
91	return nil	3✔
92	}

lightningnetwork / lnd / 14351709291

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