@@ -12,11 +12,6 @@ import (
1212	"github.com/lightninglabs/taproot-assets/fn" 
1313	"github.com/lightninglabs/taproot-assets/tapcfg" 
1414	"github.com/lightninglabs/taproot-assets/taprpc" 
15- 	"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc" 
16- 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc" 
17- 	"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc" 
18- 	tchrpc "github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc" 
19- 	"github.com/lightninglabs/taproot-assets/taprpc/universerpc" 
2015	"github.com/lightningnetwork/lnd/lnrpc" 
2116	"google.golang.org/grpc" 
2217	"gopkg.in/macaroon-bakery.v2/bakery" 
@@ -57,7 +52,7 @@ func NewTaprootAssetsSubServer(network string, cfg *tapcfg.Config,
5752	chainCfg  :=  address .ParamsForChain (network )
5853
5954	return  & taprootAssetsSubServer {
60- 		Server :    tap .NewServer (& chainCfg ,  nil ),
55+ 		Server :    tap .NewServer (& chainCfg ),
6156		cfg :       cfg ,
6257		remoteCfg : remoteCfg ,
6358		remote :    remote ,
@@ -126,12 +121,7 @@ func (t *taprootAssetsSubServer) Start(_ lnrpc.LightningClient,
126121func  (t  * taprootAssetsSubServer ) RegisterGrpcService (
127122	registrar  grpc.ServiceRegistrar ) {
128123
129- 	taprpc .RegisterTaprootAssetsServer (registrar , t )
130- 	mintrpc .RegisterMintServer (registrar , t )
131- 	assetwalletrpc .RegisterAssetWalletServer (registrar , t )
132- 	rfqrpc .RegisterRfqServer (registrar , t )
133- 	tchrpc .RegisterTaprootAssetChannelsServer (registrar , t )
134- 	universerpc .RegisterUniverseServer (registrar , t )
124+ 	_  =  t .Server .RegisterWithGrpcServer (registrar )
135125}
136126
137127// RegisterRestService registers the sub-server's REST handlers with the given 
@@ -142,58 +132,7 @@ func (t *taprootAssetsSubServer) RegisterRestService(ctx context.Context,
142132	mux  * restProxy.ServeMux , endpoint  string ,
143133	dialOpts  []grpc.DialOption ) error  {
144134
145- 	err  :=  taprpc .RegisterTaprootAssetsHandlerFromEndpoint (
146- 		ctx , mux , endpoint , dialOpts ,
147- 	)
148- 	if  err  !=  nil  {
149- 		return  err 
150- 	}
151- 
152- 	err  =  mintrpc .RegisterMintHandlerFromEndpoint (
153- 		ctx , mux , endpoint , dialOpts ,
154- 	)
155- 	if  err  !=  nil  {
156- 		return  err 
157- 	}
158- 
159- 	err  =  assetwalletrpc .RegisterAssetWalletHandlerFromEndpoint (
160- 		ctx , mux , endpoint , dialOpts ,
161- 	)
162- 	if  err  !=  nil  {
163- 		return  err 
164- 	}
165- 
166- 	err  =  rfqrpc .RegisterRfqHandlerFromEndpoint (
167- 		ctx , mux , endpoint , dialOpts ,
168- 	)
169- 	if  err  !=  nil  {
170- 		return  err 
171- 	}
172- 
173- 	err  =  tchrpc .RegisterTaprootAssetChannelsHandlerFromEndpoint (
174- 		ctx , mux , endpoint , dialOpts ,
175- 	)
176- 	if  err  !=  nil  {
177- 		return  err 
178- 	}
179- 
180- 	err  =  rfqrpc .RegisterRfqHandlerFromEndpoint (
181- 		ctx , mux , endpoint , dialOpts ,
182- 	)
183- 	if  err  !=  nil  {
184- 		return  err 
185- 	}
186- 
187- 	err  =  tchrpc .RegisterTaprootAssetChannelsHandlerFromEndpoint (
188- 		ctx , mux , endpoint , dialOpts ,
189- 	)
190- 	if  err  !=  nil  {
191- 		return  err 
192- 	}
193- 
194- 	err  =  universerpc .RegisterUniverseHandlerFromEndpoint (
195- 		ctx , mux , endpoint , dialOpts ,
196- 	)
135+ 	err  :=  t .Server .RegisterWithRestProxy (ctx , mux , dialOpts , endpoint )
197136	if  err  !=  nil  {
198137		return  err 
199138	}
0 commit comments