fix: use chain name as type of chain in registry if type is custom (#416

)

* use chain name as type of chain in registry if type is custom

* cut rc12

* update registry tests for custom chain type

charts/devnet/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.48-rc11
+version: 0.1.48-rc12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/devnet/templates/registry.yaml

@@ -116,7 +116,11 @@ data:
   assetlist.json: |-
     {
       "$schema": "../assetlist.schema.json",
+      {{- if eq $chain.type "custom" }}
+      "chain_name": "{{ $chain.name }}",
+      {{- else }}
       "chain_name": "{{ $chain.type }}",
+      {{- end }}
       {{- if hasKey $chain "assets" }}
       "assets": {{ toJson $chain.assets }}
       {{- else }}
@@ -145,7 +149,11 @@ data:
   chain.json: |-
     {
       "$schema": "../chain.schema.json",
+      {{- if eq $chain.type "custom" }}
+      "chain_name": "{{ $chain.name }}",
+      {{- else }}
       "chain_name": "{{ $chain.type }}",
+      {{- end }}
       "status": "live",
       "network_type": "mainnet",
       "chain_id": "{{ $chain.name }}",

tests/e2e/registry_test.go

@@ -61,7 +61,11 @@ func (s *TestSuite) TestRegistry_ListChains() {
 		expChain := s.config.GetChain(chain.ChainId)
 		s.Require().NotNil(expChain)
 
-		s.Require().Equal(expChain.Type, chain.ChainName)
+		if expChain.Type == "custom" {
+			s.Require().Equal(expChain.Name, chain.ChainName)
+		} else {
+			s.Require().Equal(expChain.Type, chain.ChainName)
+		}
 	}
 }
 
@@ -79,7 +83,11 @@ func (s *TestSuite) TestRegistry_GetChain() {
 		s.MakeRegistryRequest(req, respChain)
 
 		s.Require().Equal(chain.Name, respChain.ChainId)
-		s.Require().Equal(chain.Type, respChain.ChainName)
+		if chain.Type == "custom" {
+			s.Require().Equal(chain.Name, respChain.ChainName)
+		} else {
+			s.Require().Equal(chain.Type, respChain.ChainName)
+		}
 		if chain.Ports.Rpc != 0 {
 			s.Require().Equal(fmt.Sprintf("http://localhost:%d", chain.Ports.Rpc), respChain.Apis.Rpc[0].Address)
 		}
@@ -161,10 +169,14 @@ func (s *TestSuite) TestRegistry_GetChainAssets() {
 		respAssets := &pb.ResponseChainAssets{}
 		s.MakeRegistryRequest(req, respAssets)
 
-		s.Require().Equal(chain.Type, respAssets.ChainName)
+		chainName := chain.Type
+		if chain.Type == "custom" {
+			chainName = chain.Name
+		}
+		s.Require().Equal(chainName, respAssets.ChainName)
 
 		expNumAssets := 1
-		if n, ok := expectedAssets[chain.Type]; ok {
+		if n, ok := expectedAssets[chainName]; ok {
 			expNumAssets = n
 		}