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

feat: support custom mnemonics in in-process testing network (backport #10922) #10934

Merged
merged 3 commits into from
Jan 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2022

This is an automatic backport of pull request #10922 done by Mergify.
Cherry-pick of b019083 has failed:

On branch mergify/bp/release/v0.45.x/pr-10922
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit b0190834c.
  (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)

Changes to be committed:
	modified:   server/init_test.go
	modified:   simapp/simd/cmd/testnet.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   server/init.go
	both modified:   testutil/network/network.go

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

## Description

In certain cases, it proves to be beneficial to be able to support user provided mnemonics in the in-process testing network. This essentially allows you to know the validator addresses ahead of time in case you need to do any custom genesis logic (e.g. Gravity Bridge delegation keys).

---

### Author Checklist

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed

### Reviewers Checklist

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

(cherry picked from commit b019083)

# Conflicts:
#	server/init.go
#	testutil/network/network.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners January 12, 2022 11:32
@mergify mergify bot added the conflicts label Jan 12, 2022
@lgtm-com
Copy link

lgtm-com bot commented Jan 12, 2022

This pull request introduces 8 alerts when merging 46b6121 into a5c60b7 - view on LGTM.com

new alerts:

  • 7 for Unreachable statement
  • 1 for Useless assignment to local variable

@tac0turtle
Copy link
Member

@alexanderbez can you solve the conflicts?

@alexanderbez
Copy link
Contributor

I'm gonna assume liveness-test is already broken on release/v0.45.x? :(

@alexanderbez alexanderbez merged commit 90ffbce into release/v0.45.x Jan 13, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-10922 branch January 13, 2022 20:32
@faddat faddat mentioned this pull request Feb 28, 2022
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants