Return chainregistry type directly instead of nested dict for GetChain (

#58)
hyperweb-io · Apr 6, 2023 · 7ef722d · 7ef722d
1 parent 06ffe8a
commit 7ef722d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/proto/registry/service.proto b/proto/registry/service.proto
@@ -21,7 +21,7 @@ service Registry {
   rpc ListChains(google.protobuf.Empty) returns (ResponseChains) {
     option (google.api.http) = { get: "/chains" };
   }
-  rpc GetChain(RequestChain) returns (ResponseChain) {
+  rpc GetChain(RequestChain) returns (ChainRegistry) {
     option (google.api.http) = { get: "/chains/{chain}" };
   }
   // ListChainPeers will fetch all the nodes and addresses
@@ -61,10 +61,6 @@ message RequestChain {
   string chain = 1 [json_name = "chain"];
 }
 
-message ResponseChain {
-  ChainRegistry chain = 1 [json_name = "chain"];
-}
-
 message ResponseChainAssets {
   string schema = 1 [json_name = "$schema"];
   string chain_name = 2 [json_name = "chain_name"];

diff --git a/registry/handler.go b/registry/handler.go
@@ -89,7 +89,7 @@ func (a *AppServer) ListChains(ctx context.Context, _ *emptypb.Empty) (*pb.Respo
 			return nil, err
 		}
 
-		chains = append(chains, resp.Chain)
+		chains = append(chains, resp)
 	}
 
 	return &pb.ResponseChains{Chains: chains}, nil
@@ -104,7 +104,7 @@ func (a *AppServer) ListChainIDs(ctx context.Context, _ *emptypb.Empty) (*pb.Res
 // GetChain handles the incoming request for a single chain given the chain id
 // Note, we use chain-id instead of chain type, since it is expected, that there
 // can be multiple chains of same type by unique chain ids
-func (a *AppServer) GetChain(ctx context.Context, requestChain *pb.RequestChain) (*pb.ResponseChain, error) {
+func (a *AppServer) GetChain(ctx context.Context, requestChain *pb.RequestChain) (*pb.ChainRegistry, error) {
 	chainID := requestChain.Chain
 
 	filename := filepath.Join(a.config.ChainRegistry, chainID, "chain.json")
@@ -136,7 +136,7 @@ func (a *AppServer) GetChain(ctx context.Context, requestChain *pb.RequestChain)
 	}
 	chain.Apis = apis
 
-	return &pb.ResponseChain{Chain: chain}, nil
+	return chain, nil
 }
 
 func (a *AppServer) getChainPeers(ctx context.Context, client *ChainClient) (*pb.Peers, error) {