akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autopilot: fix memChannelGraph channel edge addition

Browse Source 
This PR fixes an issue that happens when adding a new channel edge
between two nodes in a memChannelGraph. Originally a channel edge held a
node value which made the graph different when iterating from the two
endpoints of an edge. This is simply fixed by holding pointers instead.
This commit is contained in:
Andras Banki-Horvath 2019-12-19 22:19:18 +01:00
parent f28b809778
commit 2c3041d8bc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autopilot/graph.go
View File

@ -307,7 +307,7 @@ func (d *databaseChannelGraph) addRandNode() (*btcec.PublicKey, error) {
// memChannelGraph is an implementation of the autopilot.ChannelGraph backed by // memChannelGraph is an implementation of the autopilot.ChannelGraph backed by
// an in-memory graph. // an in-memory graph.
type memChannelGraph struct { type memChannelGraph struct {
graph map[NodeID]memNode graph map[NodeID]*memNode
} }
// A compile time assertion to ensure memChannelGraph meets the // A compile time assertion to ensure memChannelGraph meets the
@ -318,7 +318,7 @@ var _ ChannelGraph = (*memChannelGraph)(nil)
// implementation. // implementation.
func newMemChannelGraph() *memChannelGraph { func newMemChannelGraph() *memChannelGraph {
return &memChannelGraph{ return &memChannelGraph{
graph: make(map[NodeID]memNode), graph: make(map[NodeID]*memNode),
} }
} }
@ -360,14 +360,14 @@ func (m *memChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
capacity btcutil.Amount) (*ChannelEdge, *ChannelEdge, error) { capacity btcutil.Amount) (*ChannelEdge, *ChannelEdge, error) {
var ( var (
vertex1, vertex2 memNode vertex1, vertex2 *memNode
ok bool ok bool
) )
if node1 != nil { if node1 != nil {
vertex1, ok = m.graph[NewNodeID(node1)] vertex1, ok = m.graph[NewNodeID(node1)]
if !ok { if !ok {
vertex1 = memNode{ vertex1 = &memNode{
pub: node1, pub: node1,
addrs: []net.Addr{ addrs: []net.Addr{
&net.TCPAddr{ &net.TCPAddr{
@ -381,7 +381,7 @@ func (m *memChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
vertex1 = memNode{ vertex1 = &memNode{
pub: newPub, pub: newPub,
addrs: []net.Addr{ addrs: []net.Addr{
&net.TCPAddr{ &net.TCPAddr{
@ -394,7 +394,7 @@ func (m *memChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
if node2 != nil { if node2 != nil {
vertex2, ok = m.graph[NewNodeID(node2)] vertex2, ok = m.graph[NewNodeID(node2)]
if !ok { if !ok {
vertex2 = memNode{ vertex2 = &memNode{
pub: node2, pub: node2,
addrs: []net.Addr{ addrs: []net.Addr{
&net.TCPAddr{ &net.TCPAddr{
@ -408,7 +408,7 @@ func (m *memChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
vertex2 = memNode{ vertex2 = &memNode{
pub: newPub, pub: newPub,
addrs: []net.Addr{ addrs: []net.Addr{
&net.TCPAddr{ &net.TCPAddr{
@ -446,7 +446,7 @@ func (m *memChannelGraph) addRandNode() (*btcec.PublicKey, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
vertex := memNode{ vertex := &memNode{
pub: newPub, pub: newPub,
addrs: []net.Addr{ addrs: []net.Addr{
&net.TCPAddr{ &net.TCPAddr{