From f4f3cea9a65a3448840509c66f18f46055dfe410 Mon Sep 17 00:00:00 2001 From: Xavi Soler Date: Fri, 21 Dec 2018 17:34:56 +0100 Subject: [PATCH] rpcserver: include color to getinfo and topology update --- rpcserver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index 6cb92f085..66f500282 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -2002,6 +2002,7 @@ func (r *rpcServer) GetInfo(ctx context.Context, Chains: activeChains, Uris: uris, Alias: nodeAnn.Alias.String(), + Color: routing.EncodeHexColor(nodeAnn.RGBColor), BestHeaderTimestamp: int64(bestHeaderTimestamp), Version: build.Version(), }, nil @@ -3677,13 +3678,12 @@ func (r *rpcServer) DescribeGraph(ctx context.Context, nodeAddrs = append(nodeAddrs, nodeAddr) } - nodeColor := fmt.Sprintf("#%02x%02x%02x", node.Color.R, node.Color.G, node.Color.B) resp.Nodes = append(resp.Nodes, &lnrpc.LightningNode{ LastUpdate: uint32(node.LastUpdate.Unix()), PubKey: hex.EncodeToString(node.PubKeyBytes[:]), Addresses: nodeAddrs, Alias: node.Alias, - Color: nodeColor, + Color: routing.EncodeHexColor(node.Color), }) return nil @@ -3841,14 +3841,13 @@ func (r *rpcServer) GetNodeInfo(ctx context.Context, } // TODO(roasbeef): list channels as well? - nodeColor := fmt.Sprintf("#%02x%02x%02x", node.Color.R, node.Color.G, node.Color.B) return &lnrpc.NodeInfo{ Node: &lnrpc.LightningNode{ LastUpdate: uint32(node.LastUpdate.Unix()), PubKey: in.PubKey, Addresses: nodeAddrs, Alias: node.Alias, - Color: nodeColor, + Color: routing.EncodeHexColor(node.Color), }, NumChannels: numChannels, TotalCapacity: int64(totalCapacity), @@ -4078,6 +4077,7 @@ func marshallTopologyChange(topChange *routing.TopologyChange) *lnrpc.GraphTopol IdentityKey: encodeKey(nodeUpdate.IdentityKey), GlobalFeatures: nodeUpdate.GlobalFeatures, Alias: nodeUpdate.Alias, + Color: nodeUpdate.Color, } }