Skip to content

Commit 1cadb8e

Browse files
committed
update tests for same
1 parent cc02ac3 commit 1cadb8e

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

registry/handler.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,7 @@ func (a *AppServer) ListIBC(ctx context.Context, _ *emptypb.Empty) (*pb.Response
257257
return nil, err
258258
}
259259

260-
for _, info := range infos {
261-
resData = append(resData, info.ToProto())
262-
}
260+
resData = append(resData, infos.ToProto()...)
263261
}
264262

265263
return &pb.ResponseListIBC{Data: resData}, nil

registry/model.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ func (info *ChainIBCInfo) ToProto() *pb.IBCData {
143143

144144
// GetCounterpartyChainInfo returns ChainIBCInfo struct for given counterparty
145145
// chain id.
146-
func (c ChainIBCInfos) GetCounterpartyChainInfo(chainId string) *ChainIBCInfo {
147-
for _, cii := range c {
146+
func (infos ChainIBCInfos) GetCounterpartyChainInfo(chainId string) *ChainIBCInfo {
147+
for _, cii := range infos {
148148
if cii.Counterparty.ChainId == chainId {
149149
return cii
150150
}

tests/e2e/configs/two-chain.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ relayers:
3030
global:
3131
log_level: "error"
3232
rest:
33-
enabled: false
33+
enabled: true
3434
telemetry:
3535
enabled: false
3636
event_source:
3737
mode: pull
38+
ports:
39+
rest: 3000
40+
exposer: 3002
3841

3942
explorer:
4043
enabled: true
@@ -52,4 +55,4 @@ registry:
5255
grpc: 9091
5356

5457
exposer:
55-
image: ghcr.io/cosmology-tech/starship/exposer:20231215-7c22b86
58+
image: anmol1696/exposer:20240102-cc02ac3

tests/e2e/exposer_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ func (s *TestSuite) TestExposer_CreateChannel() {
160160
}
161161

162162
// get number of channels before creating channel
163+
ibcDataBefore := s.getIBCData(relayer.Chains[0], relayer.Chains[1])
164+
s.Require().GreaterOrEqual(len(ibcDataBefore.Channels), 1, ibcDataBefore)
163165

164166
body := map[string]string{
165167
"a_chain": relayer.Chains[0],
@@ -179,6 +181,10 @@ func (s *TestSuite) TestExposer_CreateChannel() {
179181
err = json.NewDecoder(resp).Decode(&res)
180182
s.Require().NoError(err)
181183

182-
s.Require().Contains("SUCCESS Channel", res["status"].(string), "response from exposer creaste_channel", res)
184+
s.Require().Contains(res["status"].(string), "SUCCESS Channel", "response from exposer creaste_channel", res)
185+
186+
// get number of channels after creating channel
187+
ibcDataAfter := s.getIBCData(relayer.Chains[0], relayer.Chains[1])
188+
s.Require().Len(ibcDataAfter.Channels, len(ibcDataBefore.Channels)+1, "number of channels should be 1 more then before", ibcDataAfter)
183189
}
184190
}

tests/e2e/faucet_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,16 @@ func (s *TestSuite) getChainDenoms(chain *Chain) string {
8989
return respChain.Fees.FeeTokens[0].Denom
9090
}
9191

92+
func (s *TestSuite) getIBCData(aChain, bChain string) *pb.IBCData {
93+
req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("/ibc/%s/%s", aChain, bChain), nil)
94+
s.Require().NoError(err)
95+
96+
ibcData := &pb.IBCData{}
97+
s.MakeRegistryRequest(req, ibcData)
98+
99+
return ibcData
100+
}
101+
92102
func (s *TestSuite) getAccountBalance(chain *Chain, address string, denom string) float64 {
93103
data := map[string]interface{}{}
94104
s.MakeChainGetRequest(chain, fmt.Sprintf("/cosmos/bank/v1beta1/balances/%s", address), &data)

tests/e2e/registry_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (s *TestSuite) TestRegistry_ListIBC() {
276276
s.MakeRegistryRequest(req, respIBC)
277277

278278
// assert results to expected values
279-
s.Require().Len(respIBC.Data, len(s.config.Relayers)*2, "number of ibc information should be double the number of relayers")
279+
s.Require().GreaterOrEqual(len(respIBC.Data), len(s.config.Relayers)*2, "number of ibc information should be double the number of relayers")
280280
}
281281

282282
func (s *TestSuite) TestRegistry_GetChainKeys() {

0 commit comments

Comments
 (0)