rpcserver: add nil check to policy ordering
Fixes #5301. This was introduced with #5295. Since either policies can be nil, we need to always check that first.
This commit is contained in:
parent
cfa7188b1d
commit
3a5a03fa49
@ -5166,13 +5166,8 @@ func marshalDbEdge(edgeInfo *channeldb.ChannelEdgeInfo,
|
|||||||
|
|
||||||
// Make sure the policies match the node they belong to. c1 should point
|
// Make sure the policies match the node they belong to. c1 should point
|
||||||
// to the policy for NodeKey1, and c2 for NodeKey2.
|
// to the policy for NodeKey1, and c2 for NodeKey2.
|
||||||
if c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 {
|
if c1 != nil && c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 ||
|
||||||
c2, c1 = c1, c2
|
c2 != nil && c2.ChannelFlags&lnwire.ChanUpdateDirection == 0 {
|
||||||
}
|
|
||||||
|
|
||||||
// Order the edges by increasing pubkey.
|
|
||||||
if bytes.Compare(edgeInfo.NodeKey2Bytes[:],
|
|
||||||
edgeInfo.NodeKey1Bytes[:]) < 0 {
|
|
||||||
|
|
||||||
c2, c1 = c1, c2
|
c2, c1 = c1, c2
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user