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

style: lint go and markdown (backport #10060) #10473

Merged
merged 3 commits into from
Nov 11, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 30, 2021

This is an automatic backport of pull request #10060 done by Mergify.
Cherry-pick of 479485f has failed:

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

You are currently cherry-picking commit 479485f95.
  (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:   crypto/keys/multisig/amino.go
	modified:   crypto/keys/secp256k1/secp256k1_nocgo.go
	modified:   crypto/ledger/ledger_notavail.go
	modified:   docs/architecture/adr-010-modular-antehandler.md
	modified:   docs/architecture/adr-022-custom-panic-handling.md
	modified:   server/rosetta/client_online.go
	modified:   server/rosetta/lib/internal/service/online.go
	modified:   simapp/simd/cmd/genaccounts.go
	modified:   types/denom.go
	modified:   x/distribution/legacy/v043/helpers.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   CODING_GUIDELINES.md
	both modified:   CONTRIBUTING.md
	both modified:   STABLE_RELEASES.md
	both modified:   contrib/rosetta/README.md
	both modified:   cosmovisor/README.md
	both modified:   crypto/keyring/keyring.go
	deleted by us:   db/README.md
	deleted by us:   docs/404.md
	both modified:   docs/DOCS_README.md
	both modified:   docs/architecture/adr-038-state-listening.md
	both modified:   docs/architecture/adr-040-storage-and-smt-state-commitments.md
	deleted by us:   docs/architecture/adr-043-nft-module.md
	deleted by us:   docs/architecture/adr-044-protobuf-updates-guidelines.md
	deleted by us:   docs/architecture/adr-046-module-params.md
	deleted by us:   docs/migrations/pre-upgrade.md
	both modified:   docs/migrations/rest.md
	deleted by us:   docs/ru/README.md
	both modified:   docs/run-node/rosetta.md
	both modified:   docs/run-node/run-node.md
	deleted by us:   docs/run-node/run-testnet.md
	both modified:   go.mod
	deleted by us:   scripts/module-tests.sh
	deleted by us:   snapshots/README.md
	deleted by us:   store/streaming/README.md
	deleted by us:   store/streaming/file/README.md
	deleted by us:   store/v2/flat/store.go
	deleted by us:   store/v2/smt/store.go
	both modified:   x/auth/ante/sigverify.go
	deleted by us:   x/auth/middleware/basic.go
	both modified:   x/auth/spec/01_concepts.md
	both modified:   x/auth/spec/05_vesting.md
	deleted by us:   x/auth/spec/07_client.md
	deleted by us:   x/authz/spec/05_client.md
	both modified:   x/bank/spec/README.md
	deleted by us:   x/crisis/spec/05_client.md
	both modified:   x/distribution/spec/README.md
	deleted by us:   x/epoching/keeper/keeper.go
	deleted by us:   x/epoching/spec/03_to_improve.md
	deleted by us:   x/evidence/spec/07_client.md
	both modified:   x/feegrant/spec/README.md
	both modified:   x/gov/spec/01_concepts.md
	deleted by us:   x/gov/spec/07_client.md
	deleted by us:   x/group/internal/orm/spec/01_table.md
	deleted by us:   x/mint/spec/06_client.md
	deleted by us:   x/slashing/spec/09_client.md
	both modified:   x/slashing/spec/README.md
	deleted by us:   x/staking/spec/09_client.md
	deleted by us:   x/upgrade/spec/04_client.md

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.io/

## Description

+ fixing `x/bank/migrations/v44.migrateDenomMetadata` - we could potentially put a wrong data in a new key if the old keys have variable length.
+ linting the code

Putting in the same PR because i found the issue when running a linter.

Depends on: #10112

---

### 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...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] added `!` to the type prefix if API or client breaking change
- [x] 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
- [x] 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 479485f)

# Conflicts:
#	CODING_GUIDELINES.md
#	CONTRIBUTING.md
#	STABLE_RELEASES.md
#	contrib/rosetta/README.md
#	cosmovisor/README.md
#	crypto/keyring/keyring.go
#	db/README.md
#	docs/404.md
#	docs/DOCS_README.md
#	docs/architecture/adr-038-state-listening.md
#	docs/architecture/adr-040-storage-and-smt-state-commitments.md
#	docs/architecture/adr-043-nft-module.md
#	docs/architecture/adr-044-protobuf-updates-guidelines.md
#	docs/architecture/adr-046-module-params.md
#	docs/migrations/pre-upgrade.md
#	docs/migrations/rest.md
#	docs/ru/README.md
#	docs/run-node/rosetta.md
#	docs/run-node/run-node.md
#	docs/run-node/run-testnet.md
#	go.mod
#	scripts/module-tests.sh
#	snapshots/README.md
#	store/streaming/README.md
#	store/streaming/file/README.md
#	store/v2/flat/store.go
#	store/v2/smt/store.go
#	x/auth/ante/sigverify.go
#	x/auth/middleware/basic.go
#	x/auth/spec/01_concepts.md
#	x/auth/spec/05_vesting.md
#	x/auth/spec/07_client.md
#	x/authz/spec/05_client.md
#	x/bank/spec/README.md
#	x/crisis/spec/05_client.md
#	x/distribution/spec/README.md
#	x/epoching/keeper/keeper.go
#	x/epoching/spec/03_to_improve.md
#	x/evidence/spec/07_client.md
#	x/feegrant/spec/README.md
#	x/gov/spec/01_concepts.md
#	x/gov/spec/07_client.md
#	x/group/internal/orm/spec/01_table.md
#	x/mint/spec/06_client.md
#	x/slashing/spec/09_client.md
#	x/slashing/spec/README.md
#	x/staking/spec/09_client.md
#	x/upgrade/spec/04_client.md
@mergify mergify bot requested review from aaronc and alexanderbez as code owners October 30, 2021 13:43
@mergify mergify bot added the conflicts label Oct 30, 2021
@github-actions github-actions bot added C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta C:x/auth C:x/authz C:x/bank C:x/crisis C:x/distribution distribution module related C:x/evidence C:x/feegrant C:x/gov C:x/mint C:x/slashing C:x/staking C:x/upgrade T: ADR An issue or PR relating to an architectural decision record Type: Build labels Oct 30, 2021
@likhita-809
Copy link
Contributor

@robert-zaremba could you resolve the conflicts here ?

@likhita-809
Copy link
Contributor

@robert-zaremba could you resolve the conflicts here ?

seems like this PR has some conflicts @robert-zaremba

@amaury1093 amaury1093 marked this pull request as draft November 8, 2021 11:48
@amaury1093
Copy link
Contributor

Ping @robert-zaremba.

Marking as draft for now.

@robert-zaremba
Copy link
Collaborator

Will clean the conflicts. Initially I didn't want to backport this PR, but someone added a lablel.

@github-actions github-actions bot removed the C:x/bank label Nov 11, 2021
@github-actions github-actions bot removed C:x/feegrant C:Cosmovisor Issues and PR related to Cosmovisor labels Nov 11, 2021
@robert-zaremba
Copy link
Collaborator

There were a lot of changes not related to v0.44, eg: ae8645b
Next time I think we shouldn't backport this type of PRs.

@robert-zaremba robert-zaremba marked this pull request as ready for review November 11, 2021 20:15
@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label Nov 11, 2021
@robert-zaremba robert-zaremba merged commit 8a9589a into release/v0.44.x Nov 11, 2021
@robert-zaremba robert-zaremba deleted the mergify/bp/release/v0.44.x/pr-10060 branch November 11, 2021 20:29
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
* style: lint go and markdown (cosmos#10060)

## Description

+ fixing `x/bank/migrations/v44.migrateDenomMetadata` - we could potentially put a wrong data in a new key if the old keys have variable length.
+ linting the code

Putting in the same PR because i found the issue when running a linter.

Depends on: cosmos#10112

---

### 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...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [x] added `!` to the type prefix if API or client breaking change
- [x] 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
- [x] 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 479485f)

# Conflicts:
#	CODING_GUIDELINES.md
#	CONTRIBUTING.md
#	STABLE_RELEASES.md
#	contrib/rosetta/README.md
#	cosmovisor/README.md
#	crypto/keyring/keyring.go
#	db/README.md
#	docs/404.md
#	docs/DOCS_README.md
#	docs/architecture/adr-038-state-listening.md
#	docs/architecture/adr-040-storage-and-smt-state-commitments.md
#	docs/architecture/adr-043-nft-module.md
#	docs/architecture/adr-044-protobuf-updates-guidelines.md
#	docs/architecture/adr-046-module-params.md
#	docs/migrations/pre-upgrade.md
#	docs/migrations/rest.md
#	docs/ru/README.md
#	docs/run-node/rosetta.md
#	docs/run-node/run-node.md
#	docs/run-node/run-testnet.md
#	go.mod
#	scripts/module-tests.sh
#	snapshots/README.md
#	store/streaming/README.md
#	store/streaming/file/README.md
#	store/v2/flat/store.go
#	store/v2/smt/store.go
#	x/auth/ante/sigverify.go
#	x/auth/middleware/basic.go
#	x/auth/spec/01_concepts.md
#	x/auth/spec/05_vesting.md
#	x/auth/spec/07_client.md
#	x/authz/spec/05_client.md
#	x/bank/spec/README.md
#	x/crisis/spec/05_client.md
#	x/distribution/spec/README.md
#	x/epoching/keeper/keeper.go
#	x/epoching/spec/03_to_improve.md
#	x/evidence/spec/07_client.md
#	x/feegrant/spec/README.md
#	x/gov/spec/01_concepts.md
#	x/gov/spec/07_client.md
#	x/group/internal/orm/spec/01_table.md
#	x/mint/spec/06_client.md
#	x/slashing/spec/09_client.md
#	x/slashing/spec/README.md
#	x/staking/spec/09_client.md
#	x/upgrade/spec/04_client.md

* fix conflicts

* remove unnecessary files

Co-authored-by: Robert Zaremba <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:Rosetta Issues and PR related to Rosetta C:x/auth C:x/authz C:x/crisis C:x/distribution distribution module related C:x/evidence C:x/gov C:x/mint C:x/slashing C:x/staking C:x/upgrade conflicts T: ADR An issue or PR relating to an architectural decision record
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants