Skip to content

Commit 7d111bb

Browse files
committed
multi: use grpc.ServiceRegistrar param
To make things a bit more re-usable in litd, we change the type of the input parameter to the less specific interface type instead of the actual implementation struct pointer.
1 parent a41c113 commit 7d111bb

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

authmailbox/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ func (s *Server) Start() error {
102102

103103
// RegisterWithGrpcServer registers the rpcServer with the passed root gRPC
104104
// server.
105-
func (s *Server) RegisterWithGrpcServer(grpcServer *grpc.Server) error {
106-
mboxrpc.RegisterMailboxServer(grpcServer, s)
105+
func (s *Server) RegisterWithGrpcServer(registrar grpc.ServiceRegistrar) error {
106+
mboxrpc.RegisterMailboxServer(registrar, s)
107107

108108
return nil
109109
}

rpcserver.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,18 @@ func (r *rpcServer) Stop() error {
233233

234234
// RegisterWithGrpcServer registers the rpcServer with the passed root gRPC
235235
// server.
236-
func (r *rpcServer) RegisterWithGrpcServer(grpcServer *grpc.Server) error {
236+
func (r *rpcServer) RegisterWithGrpcServer(
237+
registrar grpc.ServiceRegistrar) error {
238+
237239
// Register the main RPC server.
238-
taprpc.RegisterTaprootAssetsServer(grpcServer, r)
239-
wrpc.RegisterAssetWalletServer(grpcServer, r)
240-
mintrpc.RegisterMintServer(grpcServer, r)
241-
rfqrpc.RegisterRfqServer(grpcServer, r)
242-
tchrpc.RegisterTaprootAssetChannelsServer(grpcServer, r)
243-
unirpc.RegisterUniverseServer(grpcServer, r)
244-
tapdevrpc.RegisterGrpcServer(grpcServer, r)
240+
taprpc.RegisterTaprootAssetsServer(registrar, r)
241+
wrpc.RegisterAssetWalletServer(registrar, r)
242+
mintrpc.RegisterMintServer(registrar, r)
243+
rfqrpc.RegisterRfqServer(registrar, r)
244+
tchrpc.RegisterTaprootAssetChannelsServer(registrar, r)
245+
unirpc.RegisterUniverseServer(registrar, r)
246+
tapdevrpc.RegisterGrpcServer(registrar, r)
247+
245248
return nil
246249
}
247250

taprpc/tapdevrpc/config_active.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ package tapdevrpc
44

55
import "google.golang.org/grpc"
66

7-
func RegisterGrpcServer(grpcServer *grpc.Server, srv TapDevServer) {
8-
RegisterTapDevServer(grpcServer, srv)
7+
func RegisterGrpcServer(registrar grpc.ServiceRegistrar, srv TapDevServer) {
8+
RegisterTapDevServer(registrar, srv)
99
}

taprpc/tapdevrpc/config_default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ package tapdevrpc
44

55
import "google.golang.org/grpc"
66

7-
func RegisterGrpcServer(_ *grpc.Server, _ TapDevServer) {
7+
func RegisterGrpcServer(_ grpc.ServiceRegistrar, _ TapDevServer) {
88
}

0 commit comments

Comments
 (0)