Merge pull request #5303 from guggero/policy-nil-check

rpcserver: add nil check to policy ordering
This commit is contained in:
Olaoluwa Osuntokun 2021-05-18 15:47:27 -07:00 committed by GitHub
commit 6c330d3121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5166,13 +5166,8 @@ func marshalDbEdge(edgeInfo *channeldb.ChannelEdgeInfo,
// Make sure the policies match the node they belong to. c1 should point
// to the policy for NodeKey1, and c2 for NodeKey2.
if c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 {
c2, c1 = c1, c2
}
// Order the edges by increasing pubkey.
if bytes.Compare(edgeInfo.NodeKey2Bytes[:],
edgeInfo.NodeKey1Bytes[:]) < 0 {
if c1 != nil && c1.ChannelFlags&lnwire.ChanUpdateDirection == 1 ||
c2 != nil && c2.ChannelFlags&lnwire.ChanUpdateDirection == 0 {
c2, c1 = c1, c2
}