From 42cebcfe2bb48461613e9d61aa73ef484962250a Mon Sep 17 00:00:00 2001 From: mads krogh Date: Sun, 16 Jan 2022 18:24:20 +0100 Subject: [PATCH] lnd: remove unused graph param from createRPCOpenChannel --- rpcserver.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index 9c85a8885..f2bc29d0f 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -3804,8 +3804,6 @@ func (r *rpcServer) ListChannels(ctx context.Context, resp := &lnrpc.ListChannelsResponse{} - graph := r.server.graphDB - dbChannels, err := r.server.chanStateDB.FetchAllOpenChannels() if err != nil { return nil, err @@ -3842,7 +3840,7 @@ func (r *rpcServer) ListChannels(ctx context.Context, // Next, we'll determine whether we should add this channel to // our list depending on the type of channels requested to us. isActive := peerOnline && linkActive - channel, err := createRPCOpenChannel(r, graph, dbChannel, isActive) + channel, err := createRPCOpenChannel(r, dbChannel, isActive) if err != nil { return nil, err } @@ -3903,8 +3901,8 @@ func createChannelConstraint( } // createRPCOpenChannel creates an *lnrpc.Channel from the *channeldb.Channel. -func createRPCOpenChannel(r *rpcServer, graph *channeldb.ChannelGraph, - dbChannel *channeldb.OpenChannel, isActive bool) (*lnrpc.Channel, error) { +func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel, + isActive bool) (*lnrpc.Channel, error) { nodePub := dbChannel.IdentityPub nodeID := hex.EncodeToString(nodePub.SerializeCompressed()) @@ -4330,8 +4328,6 @@ func (r *rpcServer) SubscribeChannelEvents(req *lnrpc.ChannelEventSubscription, // the server, or client exits. defer channelEventSub.Cancel() - graph := r.server.graphDB - for { select { // A new update has been sent by the channel router, we'll @@ -4351,8 +4347,9 @@ func (r *rpcServer) SubscribeChannelEvents(req *lnrpc.ChannelEventSubscription, }, } case channelnotifier.OpenChannelEvent: - channel, err := createRPCOpenChannel(r, graph, - event.Channel, true) + channel, err := createRPCOpenChannel( + r, event.Channel, true, + ) if err != nil { return err }