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.

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: refactor initialization with single node logic (backport #1963) #2019

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 11, 2022

This is an automatic backport of pull request #1963 done by Mergify.
Cherry-pick of 1da14b8 has failed:

On branch mergify/bp/v10.x/pr-1963
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit 1da14b8b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/e2e/e2e_setup_test.go
	both modified:   tests/e2e/e2e_test.go
	both modified:   tests/e2e/e2e_util_test.go
	both added:      tests/e2e/initialization/init.go
	both added:      tests/e2e/initialization/init_test.go
	both added:      tests/e2e/initialization/node/main.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* e2e: refactor initialization with single node logic

* lint and remove redundant getters from node

* restore accidental change

* rename init to InitChain

* persistentPeers typo

(cherry picked from commit 1da14b8)

# Conflicts:
#	tests/e2e/e2e_setup_test.go
#	tests/e2e/e2e_test.go
#	tests/e2e/e2e_util_test.go
#	tests/e2e/initialization/init.go
#	tests/e2e/initialization/init_test.go
#	tests/e2e/initialization/node/main.go
@mergify mergify bot requested a review from a team July 11, 2022 20:23
@mergify mergify bot added the conflicts label Jul 11, 2022
@mergify mergify bot assigned p0mvn Jul 11, 2022
@p0mvn
Copy link
Member

p0mvn commented Jul 12, 2022

This required a manual backport so it's already in: #1975

@p0mvn p0mvn closed this Jul 12, 2022
@mergify mergify bot deleted the mergify/bp/v10.x/pr-1963 branch July 12, 2022 00:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

1 participant