From b9560b067ab787f73b7902fbd230cdc8c6b9f2d5 Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Tue, 8 Aug 2023 11:43:25 +0200 Subject: [PATCH] refactor: move State server REST registration This commit moves the registration of the State server with a REST proxy into the `RegisterWithRestProxy` method in order to keep all the REST registrations in one place. --- lnd.go | 9 +-------- rpcserver.go | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lnd.go b/lnd.go index 13c4974a8..f8377f335 100644 --- a/lnd.go +++ b/lnd.go @@ -901,14 +901,7 @@ func startRestProxy(cfg *Config, rpcServer *rpcServer, restDialOpts []grpc.DialO ) // Register our services with the REST proxy. - err := lnrpc.RegisterStateHandlerFromEndpoint( - ctx, mux, restProxyDest, restDialOpts, - ) - if err != nil { - return nil, err - } - - err = rpcServer.RegisterWithRestProxy( + err := rpcServer.RegisterWithRestProxy( ctx, mux, restDialOpts, restProxyDest, ) if err != nil { diff --git a/rpcserver.go b/rpcserver.go index af127c648..2a1bacfeb 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -906,6 +906,15 @@ func (r *rpcServer) RegisterWithRestProxy(restCtx context.Context, return err } + // Register our State service with the REST proxy. + err = lnrpc.RegisterStateHandlerFromEndpoint( + restCtx, restMux, restProxyDest, restDialOpts, + ) + if err != nil { + return err + } + + // Register all the subservers with the REST proxy. for _, subServer := range r.subGrpcHandlers { err := subServer.RegisterWithRestServer( restCtx, restMux, restProxyDest, restDialOpts,