Merge pull request #7875 from ellemouton/moveStateServerRestRegister

refactor: move State server REST registration
This commit is contained in:
Oliver Gugger 2023-08-08 15:00:27 +02:00 committed by GitHub
commit dfe95d74ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

9
lnd.go
View file

@ -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 {

View file

@ -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,