Skip to content

Commit e6e7450

Browse files
committed
temp: server subservers in LNC conn
1 parent 67d4442 commit e6e7450

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

itest/litd_mode_integrated_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,9 @@ var (
311311
macaroonFn: emptyMacaroonFn,
312312
requestFn: statusRequestFn,
313313
successPattern: "\"sub_servers\":",
314-
allowedThroughLNC: false,
314+
allowedThroughLNC: true,
315315
grpcWebURI: "/litrpc.Status/SubServerStatus",
316316
restWebURI: "/v1/status",
317-
litOnly: true,
318317
noAuth: true,
319318
}}
320319

litclient/jsoncallbacks.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ var Registrations = []StubPackageRegistration{
5050
litrpc.RegisterAccountsJSONCallbacks,
5151
litrpc.RegisterAutopilotJSONCallbacks,
5252
litrpc.RegisterFirewallJSONCallbacks,
53+
litrpc.RegisterStatusJSONCallbacks,
5354
taprpc.RegisterTaprootAssetsJSONCallbacks,
5455
assetwalletrpc.RegisterAssetWalletJSONCallbacks,
5556
universerpc.RegisterUniverseJSONCallbacks,

terminal.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ func (g *LightningTerminal) start() error {
376376
),
377377
},
378378
registerGrpcServers: func(server *grpc.Server) {
379-
g.registerSubDaemonGrpcServers(server, false)
379+
g.registerSubDaemonGrpcServers(server, true)
380380
},
381381
superMacBaker: superMacBaker,
382382
firstConnectionDeadline: g.cfg.FirstLNCConnDeadline,
@@ -866,22 +866,24 @@ func (g *LightningTerminal) RegisterGrpcSubserver(server *grpc.Server) error {
866866

867867
// Register all other daemon RPC servers that are running in-process.
868868
// The LiT session server should be enabled on the main interface.
869-
g.registerSubDaemonGrpcServers(server, true)
869+
g.registerSubDaemonGrpcServers(server, false)
870870

871871
return nil
872872
}
873873

874874
// registerSubDaemonGrpcServers registers the sub daemon (Faraday, Loop, Pool
875875
// and LiT session) servers to a given gRPC server, given they are running in
876-
// the local process. The lit session server is gated by its own boolean because
877-
// we don't necessarily want to expose it on all listeners, given its security
878-
// implications.
876+
// the local process. Some of LiT's own sub-servers should be registered with
877+
// LNC sessions and some should not - the forLNCSession boolean can be used to
878+
// control this.
879879
func (g *LightningTerminal) registerSubDaemonGrpcServers(server *grpc.Server,
880-
withLitRPC bool) {
880+
forLNCSession bool) {
881881

882882
g.subServerMgr.RegisterRPCServices(server)
883883

884-
if withLitRPC {
884+
if forLNCSession {
885+
litrpc.RegisterStatusServer(server, g.statusMgr)
886+
} else {
885887
litrpc.RegisterSessionsServer(server, g.sessionRpcServer)
886888
litrpc.RegisterAccountsServer(server, g.accountRpcServer)
887889
}

0 commit comments

Comments
 (0)