refactor: Improve txRaw decoder code (backport #9769) #9779

mergify · 2021-07-26T20:08:35Z

This is an automatic backport of pull request #9769 done by Mergify.
Cherry-pick of 3771ebd has failed:

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

You are currently cherry-picking commit 3771ebdf2.
  (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:   x/auth/tx/decoder.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.io/

## Description Apply post-merge reviews to a previous PR ref: #9754 (review)  --- ### 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 3771ebd) # Conflicts: # x/auth/tx/decoder.go

orijbot · 2021-07-26T20:16:02Z

Visit https://dashboard.github.orijtech.com?pr=9779&repo=cosmos%2Fcosmos-sdk to see benchmark details.

lgtm-com · 2021-07-26T20:35:10Z

This pull request introduces 2 alerts when merging 2d6b0a8 into 9fd720e - view on LGTM.com

new alerts:

2 for Unreachable statement

amaury1093 · 2021-07-27T08:36:55Z

@Mergifyio rebase

mergify · 2021-07-27T08:37:20Z

Command rebase: failure

Base branch update has failed
Git reported the following error:
Rebasing (1/1)

error: could not apply 2d6b0a8... refactor: Improve txRaw decoder code (#9769)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 2d6b0a8... refactor: Improve txRaw decoder code (#9769)
Auto-merging x/auth/tx/decoder.go
CONFLICT (content): Merge conflict in x/auth/tx/decoder.go
err-code: AB8A1

…into mergify/bp/release/v0.43.x/pr-9769

amaury1093 · 2021-07-28T09:07:46Z

server/grpc/gogoreflection/fix_registration.go

@@ -86,7 +85,7 @@ func getFileDescriptor(filePath string) []byte {
 	if len(fd) != 0 {
 		return fd
 	}
-	// nolint: staticcheck
+


for reference: these changes on an unrelated file are to satisfy the linter: https://github.com/cosmos/cosmos-sdk/runs/3169775342#step:4:77

) * refactor: Improve txRaw decoder code (cosmos#9769)  ## Description Apply post-merge reviews to a previous PR ref: cosmos#9754 (review)  --- ### 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 3771ebd) # Conflicts: # x/auth/tx/decoder.go * Fix lint? * Fix lint Co-authored-by: Amaury <[email protected]>

mergify bot requested review from aaronc and alexanderbez as code owners July 26, 2021 20:08

mergify bot added the conflicts label Jul 26, 2021

github-actions bot added the C:x/auth label Jul 26, 2021

amaury1093 mentioned this pull request Jul 27, 2021

feat: TxRaw must follow ADR 027 (backport #9743) #9754

Merged

Merge branch 'release/v0.43.x' of ssh://github.com/cosmos/cosmos-sdk …

734fb27

…into mergify/bp/release/v0.43.x/pr-9769

amaury1093 removed the conflicts label Jul 27, 2021

amaury1093 approved these changes Jul 27, 2021

View reviewed changes

amaury1093 added 2 commits July 27, 2021 16:33

Fix lint?

eb1dfb5

Fix lint

db65e51

robert-zaremba approved these changes Jul 27, 2021

View reviewed changes

robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label Jul 27, 2021

amaury1093 merged commit b402d1c into release/v0.43.x Jul 27, 2021

amaury1093 deleted the mergify/bp/release/v0.43.x/pr-9769 branch July 27, 2021 15:09

amaury1093 mentioned this pull request Jul 28, 2021

chore: added changelog for 9793 (secp256r1 tx malleability) (backport #9796) #9798

Merged

amaury1093 reviewed Jul 28, 2021

View reviewed changes

fedekunze mentioned this pull request Nov 14, 2021

all: cherry pick olympus mons tharsis/cosmos-sdk#1

Closed

19 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Improve txRaw decoder code (backport #9769) #9779

refactor: Improve txRaw decoder code (backport #9769) #9779

mergify bot commented Jul 26, 2021

orijbot commented Jul 26, 2021

lgtm-com bot commented Jul 26, 2021

amaury1093 commented Jul 27, 2021

mergify bot commented Jul 27, 2021

amaury1093 Jul 28, 2021 •

edited

Loading

refactor: Improve txRaw decoder code (backport #9769) #9779

refactor: Improve txRaw decoder code (backport #9769) #9779

Conversation

mergify bot commented Jul 26, 2021

orijbot commented Jul 26, 2021

lgtm-com bot commented Jul 26, 2021

amaury1093 commented Jul 27, 2021

mergify bot commented Jul 27, 2021

amaury1093 Jul 28, 2021 • edited Loading

Choose a reason for hiding this comment

amaury1093 Jul 28, 2021 •

edited

Loading