inital correctness of registry service (#240)

* inital correctness of registry service * add assets into the default defination of the chains * update default to add assets for all defaultChains * use local image of registry for tests, add empty test * fix tests, use require instead of asserts * set registry image as debug test image, change after merge
cosmology-tech · Sep 15, 2023 · 6b2102d · 6b2102d
1 parent a7877b7
commit 6b2102d
Show file tree

Hide file tree

Showing 22 changed files with 568 additions and 56 deletions.
diff --git a/charts/devnet/defaults.yaml b/charts/devnet/defaults.yaml
diff --git a/charts/devnet/templates/registry.yaml b/charts/devnet/templates/registry.yaml
@@ -118,6 +118,9 @@ data:
     {
       "$schema": "../assetlist.schema.json",
       "chain_name": "{{ $chain.type }}",
+      {{- if hasKey $chain "assets" }}
+      "assets": {{ toJson $chain.assets }}
+      {{- else }}
       "assets": [
         {
           "description": "The denom for token {{ $chain.denom }}",
@@ -138,6 +141,7 @@ data:
           "coingecko_id": "{{ $chain.type }}"
         }
       ]
+      {{- end }}
     }
   chain.json: |-
     {
@@ -146,6 +150,7 @@ data:
       "status": "live",
       "network_type": "mainnet",
       "chain_id": "{{ $chain.name }}",
+      "pretty_name": "{{ $chain.prettyName }}",
       "bech32_prefix": "{{ $chain.prefix }}",
       "daemon_name": "{{ $chain.binary }}",
       "node_home": "{{ $chain.home }}",

diff --git a/charts/devnet/values.schema.json b/charts/devnet/values.schema.json
@@ -148,6 +148,9 @@
           "denom": {
             "type": "string"
           },
+          "prettyName": {
+            "type": "string"
+          },
           "coins": {
             "type": "string"
           },

diff --git a/examples/upgrade-test/setup_test.go b/examples/upgrade-test/setup_test.go
@@ -17,9 +17,9 @@ func (s *TestSuite) TestChainsStatus() {
 
 	for _, chainClient := range s.chainClients {
 		status, err := chainClient.GetStatus()
-		s.Assert().NoError(err)
+		s.Require().NoError(err)
 
-		s.Assert().Equal(chainClient.GetChainID(), status.NodeInfo.Network)
+		s.Require().Equal(chainClient.GetChainID(), status.NodeInfo.Network)
 	}
 }
 
@@ -41,9 +41,9 @@ func (s *TestSuite) TestChainTokenTransfer() {
 	s.Require().NoError(err)
 
 	// Assert correct transfers
-	s.Assert().Len(balance, 1)
-	s.Assert().Equal(balance.Denoms(), []string{denom})
-	s.Assert().Equal(balance[0].Amount, sdk.NewInt(2345000))
+	s.Require().Len(balance, 1)
+	s.Require().Equal(balance.Denoms(), []string{denom})
+	s.Require().Equal(balance[0].Amount, sdk.NewInt(2345000))
 }
 
 func (s *TestSuite) TestChainIBCTransfer() {
@@ -69,7 +69,7 @@ func (s *TestSuite) TestChainIBCTransfer() {
 	s.Require().NoError(err)
 
 	// Assert correct transfers
-	s.Assert().Len(balance, 1)
-	s.Assert().Equal(balance.Denoms(), []string{chain2Denom})
-	s.Assert().Equal(balance[0].Amount, sdk.NewInt(12345000))
+	s.Require().Len(balance, 1)
+	s.Require().Equal(balance.Denoms(), []string{chain2Denom})
+	s.Require().Equal(balance[0].Amount, sdk.NewInt(12345000))
 }
diff --git a/examples/upgrade-test/suite.go b/examples/upgrade-test/suite.go
@@ -74,15 +74,15 @@ func (s *TestSuite) WaitForTx(chain *starship.ChainClient, txHex string) {
 		time.Second,
 		"waited for too long, still txn not successfull",
 	)
-	s.Assert().NotNil(tx)
+	s.Require().NotNil(tx)
 }
 
 // WaitForHeight will wait till the chain reaches the block height
 func (s *TestSuite) WaitForHeight(chain *starship.ChainClient, height int64) {
 	s.Require().Eventuallyf(
 		func() bool {
 			curHeight, err := chain.GetHeight()
-			s.Assert().NoError(err)
+			s.Require().NoError(err)
 			if curHeight >= height {
 				return true
 			}

diff --git a/examples/upgrade-test/upgrade_test.go b/examples/upgrade-test/upgrade_test.go
@@ -121,9 +121,9 @@ func (s *TestSuite) TestChainUpgrade() {
 	balance, err := chain.Client.QueryBalanceWithDenomTraces(context.Background(), sdk.MustAccAddressFromBech32(address), nil)
 	s.Require().NoError(err)
 	// Assert correct transfers
-	s.Assert().Len(balance, 1)
-	s.Assert().Equal(balance.Denoms(), []string{denom})
-	s.Assert().Equal(balance[0].Amount, sdk.NewInt(12312300))
+	s.Require().Len(balance, 1)
+	s.Require().Equal(balance.Denoms(), []string{denom})
+	s.Require().Equal(balance[0].Amount, sdk.NewInt(12312300))
 	s.T().Logf("post-upgrade: verifed balance of address after upgrade")
 
 	// transfer some more tokens to address
@@ -136,9 +136,9 @@ func (s *TestSuite) TestChainUpgrade() {
 	balance, err = chain.Client.QueryBalanceWithDenomTraces(context.Background(), sdk.MustAccAddressFromBech32(address), nil)
 	s.Require().NoError(err)
 	// Assert correct transfers
-	s.Assert().Len(balance, 1)
-	s.Assert().Equal(balance.Denoms(), []string{denom})
-	s.Assert().Equal(balance[0].Amount, sdk.NewInt(24624600))
+	s.Require().Len(balance, 1)
+	s.Require().Equal(balance.Denoms(), []string{denom})
+	s.Require().Equal(balance[0].Amount, sdk.NewInt(24624600))
 	s.T().Logf("post-upgrade: verify that the address has double tokens")
 
 	s.T().Log("Successful Chain Upgrade")

diff --git a/proto/registry/chain.proto b/proto/registry/chain.proto
@@ -124,7 +124,7 @@ message ChainRegistry {
 
 message DenomUnit {
   string denom = 1 [json_name = "denom"];
-  int64 exponent = 2 [json_name = "exponent"];
+  int32 exponent = 2 [json_name = "exponent"];
   repeated string aliases = 3 [json_name = "aliases"];
 }
 

diff --git a/registry/chain.go b/registry/chain.go
@@ -178,6 +178,14 @@ func (c *ChainClient) getChannelsPorts() ([]ChannelsInfo, error) {
 			return nil, fmt.Errorf("number of connections not 1")
 		}
 
+		ordering := "none"
+		switch channel.Ordering {
+		case 1:
+			ordering = "unordered"
+		case 2:
+			ordering = "ordered"
+		}
+
 		ci := ChannelsInfo{
 			ChannelPort: ChannelPort{
 				ChannelId: channel.ChannelId,
@@ -188,7 +196,7 @@ func (c *ChainClient) getChannelsPorts() ([]ChannelsInfo, error) {
 				PortId:    channel.Counterparty.PortId,
 			},
 			ConnectionId: channel.ConnectionHops[0],
-			Ordering:     channel.Ordering.String(),
+			Ordering:     ordering,
 			Version:      channel.Version,
 		}
 

diff --git a/registry/registry/chain.pb.go b/registry/registry/chain.pb.go
diff --git a/tests/e2e/configs/build-chain.yaml b/tests/e2e/configs/build-chain.yaml
@@ -33,6 +33,7 @@ relayers:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091
diff --git a/tests/e2e/configs/evmos.yaml b/tests/e2e/configs/evmos.yaml
@@ -30,6 +30,7 @@ relayers:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091
diff --git a/tests/e2e/configs/injective.yaml b/tests/e2e/configs/injective.yaml
@@ -27,6 +27,7 @@ relayers:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091
diff --git a/tests/e2e/configs/multi-validator.yaml b/tests/e2e/configs/multi-validator.yaml
@@ -22,6 +22,7 @@ chains:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091

diff --git a/tests/e2e/configs/one-chain-custom-scripts.yaml b/tests/e2e/configs/one-chain-custom-scripts.yaml
@@ -26,6 +26,7 @@ chains:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091

diff --git a/tests/e2e/configs/one-chain.yaml b/tests/e2e/configs/one-chain.yaml
@@ -25,6 +25,7 @@ chains:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091

diff --git a/tests/e2e/configs/one-custom-chain.yaml b/tests/e2e/configs/one-custom-chain.yaml
@@ -22,6 +22,7 @@ chains:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091

diff --git a/tests/e2e/configs/simapp.yaml b/tests/e2e/configs/simapp.yaml
@@ -20,6 +20,7 @@ chains:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
   resources:

diff --git a/tests/e2e/configs/two-chain-gorelayer.yaml b/tests/e2e/configs/two-chain-gorelayer.yaml
@@ -32,6 +32,7 @@ explorer:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091
diff --git a/tests/e2e/configs/two-chain.yaml b/tests/e2e/configs/two-chain.yaml
@@ -45,6 +45,7 @@ explorer:
 
 registry:
   enabled: true
+  image: anmol1696/registry:20230914-a6ee678
   ports:
     rest: 8081
     grpc: 9091
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -70,10 +70,10 @@ func (s *TestSuite) TestChains_Status() {
 		body := s.MakeRequest(req, 200)
 		resp := &pb.Status{}
 		err = jsonpb.Unmarshal(body, resp)
-		s.Assert().NoError(err)
+		s.Require().NoError(err)
 
 		// assert chain id
-		s.Assert().Equal(chain.Name, resp.Result.NodeInfo.Network)
+		s.Require().Equal(chain.Name, resp.Result.NodeInfo.Network)
 	}
 }
 

diff --git a/tests/e2e/exposer_test.go b/tests/e2e/exposer_test.go
@@ -37,7 +37,7 @@ func (s *TestSuite) TestExposer_GetNodeID() {
 	s.MakeExposerRequest(chain, req, resp)
 
 	// assert results to expected values
-	s.Assert().NotEmpty(resp.NodeId)
+	s.Require().NotEmpty(resp.NodeId)
 }
 
 func (s *TestSuite) TestExposer_GetGenesisFile() {
@@ -53,8 +53,8 @@ func (s *TestSuite) TestExposer_GetGenesisFile() {
 	s.MakeExposerRequest(chain, req, resp)
 
 	// assert results to expected values
-	s.Assert().NotNil(resp)
-	s.Assert().Equal(chain.Name, resp.AsMap()["chain_id"])
+	s.Require().NotNil(resp)
+	s.Require().Equal(chain.Name, resp.AsMap()["chain_id"])
 }
 
 func (s *TestSuite) TestExposer_GetPubKey() {
@@ -69,9 +69,9 @@ func (s *TestSuite) TestExposer_GetPubKey() {
 	s.MakeExposerRequest(chain, req, resp)
 
 	// assert results to expected values
-	s.Assert().NotNil(resp)
-	s.Assert().NotEmpty(resp.Key)
-	s.Assert().Equal("/cosmos.crypto.ed25519.PubKey", resp.Type)
+	s.Require().NotNil(resp)
+	s.Require().NotEmpty(resp.Key)
+	s.Require().Equal("/cosmos.crypto.ed25519.PubKey", resp.Type)
 }
 
 func (s *TestSuite) TestExposer_GetPrivKey() {
@@ -87,9 +87,9 @@ func (s *TestSuite) TestExposer_GetPrivKey() {
 	s.MakeExposerRequest(chain, req, resp)
 
 	// assert results to expected values
-	s.Assert().NotNil(resp)
-	s.Assert().NotEmpty(resp.PrivKey)
-	s.Assert().NotEmpty(resp.PubKey)
+	s.Require().NotNil(resp)
+	s.Require().NotEmpty(resp.PrivKey)
+	s.Require().NotEmpty(resp.PubKey)
 }
 
 func (s *TestSuite) TestExposer_GetKeys() {
@@ -104,9 +104,9 @@ func (s *TestSuite) TestExposer_GetKeys() {
 	s.MakeExposerRequest(chain, req, resp)
 
 	// assert results to expected values
-	s.Assert().NotNil(resp)
-	s.Assert().Len(resp.Genesis, 1)
-	s.Assert().Len(resp.Validators, 4)
-	s.Assert().Len(resp.Keys, 3)
-	s.Assert().Len(resp.Relayers, 2)
+	s.Require().NotNil(resp)
+	s.Require().Len(resp.Genesis, 1)
+	s.Require().Len(resp.Validators, 4)
+	s.Require().Len(resp.Keys, 3)
+	s.Require().Len(resp.Relayers, 2)
 }