Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e with IBC tx and test #1216

Merged
merged 13 commits into from
Apr 8, 2022
Merged

e2e with IBC tx and test #1216

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
13027cc
second chain with tests
Apr 6, 2022
e1d35e9
add hermes, comment out balance query for now
Apr 6, 2022
a0007c5
Merge branch 'main' into adam/e2e-test-ibc
Apr 6, 2022
625d894
eventually
Apr 7, 2022
6311466
Update Makefile
czarcas7ic Apr 7, 2022
bf33585
remove gas fees and unused functions
Apr 7, 2022
bf51d99
readded check
Apr 8, 2022
4b91fd4
Nicco changes to own hermes image
czarcas7ic Apr 8, 2022
9442265
Remove unused hermes.Dockerfile
Apr 8, 2022
af9ed4a
Use a single Dockerfile for both debug and official image
Apr 8, 2022
c38c1c6
readd build hermes in makefile
czarcas7ic Apr 8, 2022
d0b3705
remove hermes
czarcas7ic Apr 8, 2022
826bad4
Set correct golang image and use correct debug image tag
Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ benchmark:
docker-build-debug:
@docker build -t osmolabs/osmosisd-e2e --build-arg IMG_TAG=debug -f e2e.Dockerfile .

# TODO: Push this to the Cosmos Dockerhub so we don't have to keep building it
# in CI.
docker-build-hermes:
p0mvn marked this conversation as resolved.
Show resolved Hide resolved
@cd tests/e2e/docker; docker build -t osmolabs/hermes-e2e:latest -f hermes.Dockerfile .

###############################################################################
### Linting ###
###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/docker/hermes.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM informalsystems/hermes:0.13.0 AS hermes-builder
FROM osmolabs/hermes:0.13.0 AS hermes-builder
p0mvn marked this conversation as resolved.
Show resolved Hide resolved

FROM debian:buster-slim
USER root
Expand Down
11 changes: 9 additions & 2 deletions tests/e2e/e2e_setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,19 @@ func (s *IntegrationTestSuite) runIBCRelayer() {
s.hermesResource, err = s.dkrPool.RunWithOptions(
&dockertest.RunOptions{
Name: fmt.Sprintf("%s-%s-relayer", s.chainA.id, s.chainB.id),
Repository: "ghcr.io/cosmos/hermes-e2e",
Tag: "latest",
Repository: "osmolabs/hermes",
p0mvn marked this conversation as resolved.
Show resolved Hide resolved
Tag: "0.13.0",
NetworkID: s.dkrNet.Network.ID,
Cmd: []string{
"start",
},
User: "root:root",
Mounts: []string{
fmt.Sprintf("%s/:/root/hermes", hermesCfgPath),
},
ExposedPorts: []string{
"3031",
},
PortBindings: map[docker.Port][]docker.PortBinding{
"3031/tcp": {{HostIP: "", HostPort: "3031"}},
},
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ func (s *IntegrationTestSuite) TestQueryBalances() {
balancesA, err := queryBalances(chainAAPIEndpoint, s.chainA.validators[0].keyInfo.GetAddress().String())
s.Require().NoError(err)
s.Require().NotNil(balancesA)
// s.Require().Equal(2, len(balancesA))
s.Require().Equal(2, len(balancesA))

chainBAPIEndpoint := fmt.Sprintf("http://%s", s.valResources[s.chainB.id][0].GetHostPort("1317/tcp"))
balancesB, err := queryBalances(chainBAPIEndpoint, s.chainB.validators[0].keyInfo.GetAddress().String())
s.Require().NoError(err)
s.Require().NotNil(balancesB)
// s.Require().Equal(2, len(balancesB))
s.Require().Equal(3, len(balancesB))

actualDenomsA := make([]string, 0, 2)
actualBalancesA := make([]uint64, 0, 2)
Expand Down