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

fix: Cap Initialization Fix (forward-port #9392) #9806

Merged
merged 3 commits into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This PR is a forward-port of #9392 from release/v0.42.x to master.

It was initially decided in #9392 (comment) that #9392 would be a temporary fix for 0.42, but as per @AdityaSripal's request we're actually foward-porting this to master too.

Mergify description:

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

On branch mergify/bp/master/pr-9392
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 3776793ce.
  (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:   x/bank/simulation/params.go
	modified:   x/capability/keeper/keeper.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x/ibc/applications/transfer/simulation/params.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.io/

(cherry picked from commit 3776793)

# Conflicts:
#	x/ibc/applications/transfer/simulation/params.go
@mergify mergify bot added the conflicts label Jul 28, 2021
@mergify mergify bot mentioned this pull request Jul 28, 2021
9 tasks
@orijbot
Copy link

orijbot commented Jul 28, 2021

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

@amaury1093 amaury1093 changed the title Cap Initialization Fix (backport #9392) fix: Cap Initialization Fix (forward-port #9392) Jul 28, 2021
@codecov
Copy link

codecov bot commented Jul 28, 2021

Codecov Report

Merging #9806 (c5fa826) into master (f4d0682) will increase coverage by 0.01%.
The diff coverage is 64.33%.

❗ Current head c5fa826 differs from pull request most recent head 8d77c32. Consider uploading reports for the commit 8d77c32 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9806      +/-   ##
==========================================
+ Coverage   63.47%   63.49%   +0.01%     
==========================================
  Files         566      566              
  Lines       52797    53084     +287     
==========================================
+ Hits        33515    33705     +190     
- Misses      17379    17472      +93     
- Partials     1903     1907       +4     
Impacted Files Coverage Δ
crypto/ledger/ledger_secp256k1.go 52.89% <0.00%> (ø)
types/events.go 82.77% <ø> (ø)
x/auth/client/cli/query.go 2.15% <6.41%> (+2.15%) ⬆️
x/auth/ante/sigverify.go 68.07% <38.00%> (-5.86%) ⬇️
crypto/keyring/keyring.go 59.41% <80.00%> (+0.23%) ⬆️
crypto/keys/internal/ecdsa/privkey.go 82.45% <84.00%> (+0.63%) ⬆️
client/keys/add.go 67.42% <100.00%> (ø)
crypto/keys/internal/ecdsa/pubkey.go 77.08% <100.00%> (+9.43%) ⬆️
x/auth/client/testutil/suite.go 96.31% <100.00%> (+0.40%) ⬆️
x/capability/keeper/keeper.go 83.06% <100.00%> (+0.93%) ⬆️

@amaury1093 amaury1093 added the A:automerge Automatically merge PR once all prerequisites pass. label Jul 28, 2021
@mergify mergify bot merged commit d587599 into master Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/master/pr-9392 branch July 28, 2021 14:38
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:Simulations C:x/bank C:x/capability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants