chore: bump ibctest version and ibc-go version to v6 for e2e module #2479

colin-axner · 2022-10-05T17:09:31Z

Description

closes: #XXXX

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

Targeted PR against correct branch (see CONTRIBUTING.md)
Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
Code follows the module structure standards.
Wrote unit and integration tests
Updated relevant documentation (docs/) or specification (x/<module>/spec/)
Added relevant godoc comments.
Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
Re-reviewed Files changed in the Github PR explorer
Review Codecov Report in the comment section below once CI passes

e2e/testconfig/testconfig.go

e2e/testsuite/relayer.go

codecov-commenter · 2022-10-05T17:23:46Z

Codecov Report

Merging #2479 (822b6b8) into main (3363917) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2479   +/-   ##
=======================================
  Coverage   78.65%   78.65%           
=======================================
  Files         178      178           
  Lines       12367    12367           
=======================================
  Hits         9727     9727           
  Misses       2208     2208           
  Partials      432      432

Impacted Files	Coverage Δ
modules/core/23-commitment/types/merkle.go	`68.60% <0.00%> (ø)`

colin-axner · 2022-10-05T17:49:14Z

e2e/testsuite/relayer.go

 	"go.uber.org/zap"

 	"github.com/cosmos/ibc-go/e2e/testconfig"
 )

 const (
 	cosmosRelayerRepository = "ghcr.io/cosmos/relayer"
+	cosmosRelayerUser       = "100:1000" // docker run -it --rm --entrypoint echo ghcr.io/cosmos/relayer "$(id -u):$(id -g)"


Maybe this should be a const in ibctest.

nice suggestion, opened an issue strangelove-ventures/interchaintest#321

colin-axner · 2022-10-05T17:50:27Z

e2e/testsuite/relayer.go

+// Options are used to allow for relayer version selection and specifying the default processing option.
 func newCosmosRelayer(t *testing.T, tc testconfig.TestConfig, logger *zap.Logger, dockerClient *dockerclient.Client, network string) ibc.Relayer {
-	return ibctest.NewBuiltinRelayerFactory(ibc.CosmosRly, logger, relayer.CustomDockerImage(cosmosRelayerRepository, tc.RlyTag), relayer.StartupFlags("-p", "events")).Build(
+	customImageOption := relayer.CustomDockerImage(cosmosRelayerRepository, tc.RlyTag, cosmosRelayerUser)
+	relayerProcessingOption := relayer.StartupFlags("-p", "events") // relayer processes via events
+
+	relayerFactory := ibctest.NewBuiltinRelayerFactory(ibc.CosmosRly, logger, customImageOption, relayerProcessingOption)
+
+	return relayerFactory.Build(


decided to breakup this function a little to increase readability

damiannolan

Nice one! Thanks for handling this 🚀

Looking forward to updating the x/group integration e2e!

damiannolan · 2022-10-05T21:08:52Z

e2e/testsuite/relayer.go

 	"go.uber.org/zap"

 	"github.com/cosmos/ibc-go/e2e/testconfig"
 )

 const (
 	cosmosRelayerRepository = "ghcr.io/cosmos/relayer"
+	cosmosRelayerUser       = "100:1000" // docker run -it --rm --entrypoint echo ghcr.io/cosmos/relayer "$(id -u):$(id -g)"


Maybe this should be a const in ibctest.

crodriguezvega

LGTM. Thanks, @colin-axner.

…2479) ## Description closes: #XXXX --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules/structure.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing) - [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`) - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md` - [ ] Re-reviewed `Files changed` in the Github PR explorer - [ ] Review `Codecov Report` in the comment section below once CI passes (cherry picked from commit 4bd05c6) # Conflicts: # e2e/go.mod # e2e/go.sum # e2e/testconfig/testconfig.go # e2e/tests/core/client_test.go # e2e/tests/interchain_accounts/base_test.go # e2e/tests/interchain_accounts/incentivized_test.go # e2e/tests/transfer/base_test.go # e2e/tests/transfer/incentivized_test.go # e2e/tests/upgrades/upgrade_test.go # e2e/testsuite/grpc_query.go # e2e/testsuite/relayer.go # e2e/testsuite/testsuite.go

…backport #2479) (#2729) * chore: bump ibctest version and ibc-go version to v6 for e2e module (#2479) ## Description closes: #XXXX --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules/structure.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing) - [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`) - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md` - [ ] Re-reviewed `Files changed` in the Github PR explorer - [ ] Review `Codecov Report` in the comment section below once CI passes (cherry picked from commit 4bd05c6) # Conflicts: # e2e/go.mod # e2e/go.sum # e2e/testconfig/testconfig.go # e2e/tests/core/client_test.go # e2e/tests/interchain_accounts/base_test.go # e2e/tests/interchain_accounts/incentivized_test.go # e2e/tests/transfer/base_test.go # e2e/tests/transfer/incentivized_test.go # e2e/tests/upgrades/upgrade_test.go # e2e/testsuite/grpc_query.go # e2e/testsuite/relayer.go # e2e/testsuite/testsuite.go * fix conflicts Co-authored-by: colin axnér <[email protected]> Co-authored-by: Carlos Rodriguez <[email protected]>

chore: bump ibctest version and ibc-go version to v6

822b6b8

colin-axner commented Oct 5, 2022

View reviewed changes

e2e/testconfig/testconfig.go Outdated Show resolved Hide resolved

e2e/testsuite/relayer.go Outdated Show resolved Hide resolved

colin-axner added 4 commits October 5, 2022 19:47

fix: use correct uid/gid

5adc241

self nit

c1bf03b

use chain config, remove unnecessary arg

f05a528

Merge branch 'main' into colin/bump-ibctest

023810e

colin-axner commented Oct 5, 2022

View reviewed changes

colin-axner marked this pull request as ready for review October 5, 2022 17:56

colin-axner requested review from AdityaSripal, crodriguezvega, seantking, charleenfei, damiannolan and chatton as code owners October 5, 2022 17:56

damiannolan approved these changes Oct 5, 2022

View reviewed changes

crodriguezvega approved these changes Oct 6, 2022

View reviewed changes

Merge branch 'main' into colin/bump-ibctest

05e628a

colin-axner added the automerge label Oct 6, 2022

Merge branch 'main' into colin/bump-ibctest

474f761

mergify bot merged commit 4bd05c6 into main Oct 6, 2022

mergify bot deleted the colin/bump-ibctest branch October 6, 2022 11:22

chatton mentioned this pull request Nov 7, 2022

Add git cliff toml to support generation of changelog #2697

Merged

9 tasks

crodriguezvega added the backport-to-v6.0.x label Nov 11, 2022

mergify bot mentioned this pull request Nov 11, 2022

chore: bump ibctest version and ibc-go version to v6 for e2e module (backport #2479) #2729

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: bump ibctest version and ibc-go version to v6 for e2e module #2479

chore: bump ibctest version and ibc-go version to v6 for e2e module #2479

colin-axner commented Oct 5, 2022 •

edited

Loading

codecov-commenter commented Oct 5, 2022

colin-axner Oct 5, 2022

damiannolan Oct 5, 2022

colin-axner Oct 6, 2022

colin-axner Oct 5, 2022

damiannolan left a comment

damiannolan Oct 5, 2022

crodriguezvega left a comment

chore: bump ibctest version and ibc-go version to v6 for e2e module #2479

chore: bump ibctest version and ibc-go version to v6 for e2e module #2479

Conversation

colin-axner commented Oct 5, 2022 • edited Loading

Description

codecov-commenter commented Oct 5, 2022

Codecov Report

colin-axner Oct 5, 2022

Choose a reason for hiding this comment

damiannolan Oct 5, 2022

Choose a reason for hiding this comment

colin-axner Oct 6, 2022

Choose a reason for hiding this comment

colin-axner Oct 5, 2022

Choose a reason for hiding this comment

damiannolan left a comment

Choose a reason for hiding this comment

damiannolan Oct 5, 2022

Choose a reason for hiding this comment

crodriguezvega left a comment

Choose a reason for hiding this comment

colin-axner commented Oct 5, 2022 •

edited

Loading