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

Rename InfoImporter -> LegacyInfoImporter (bp #8739) #8740

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2021

This is an automatic backport of pull request #8739 done by Mergify.

Cherry-pick of 010eeef has failed:

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

You are currently cherry-picking commit 010eeef45.
  (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:   client/keys/migrate.go
	both modified:   crypto/keyring/keyring.go

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

Avoid namespace clash with the InfoImporter interface
that already exists in the v0.41 release series.

(cherry picked from commit 010eeef)

# Conflicts:
#	client/keys/migrate.go
#	crypto/keyring/keyring.go
@codecov
Copy link

codecov bot commented Mar 1, 2021

Codecov Report

Merging #8740 (010eeef) into release/v0.41.x (ee90640) will decrease coverage by 0.48%.
The diff coverage is 51.30%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release/v0.41.x    #8740      +/-   ##
===================================================
- Coverage            61.93%   61.44%   -0.49%     
===================================================
  Files                  612      673      +61     
  Lines                35412    38361    +2949     
===================================================
+ Hits                 21932    23571    +1639     
- Misses               11168    12309    +1141     
- Partials              2312     2481     +169     
Impacted Files Coverage Δ
baseapp/grpcserver.go 2.70% <0.00%> (ø)
client/context.go 58.09% <0.00%> (-1.13%) ⬇️
client/flags/flags.go 20.83% <0.00%> (-0.45%) ⬇️
client/keys/parse.go 76.27% <0.00%> (ø)
client/query.go 20.45% <0.00%> (-0.48%) ⬇️
client/rpc/block.go 10.00% <ø> (ø)
client/rpc/validators.go 0.00% <0.00%> (ø)
client/tx/tx.go 29.09% <0.00%> (-0.14%) ⬇️
codec/amino.go 72.22% <ø> (ø)
crypto/keyring/legacy.go 44.77% <ø> (-3.42%) ⬇️
... and 241 more

@lgtm-com
Copy link

lgtm-com bot commented Mar 1, 2021

This pull request introduces 7 alerts when merging c338c76 into ee90640 - view on LGTM.com

new alerts:

  • 4 for Unreachable statement
  • 3 for Useless assignment to local variable

@alessio
Copy link
Contributor

alessio commented Mar 2, 2021

superseded by #8738

@alessio alessio closed this Mar 2, 2021
@alessio alessio deleted the mergify/bp/release/v0.41.x/pr-8739 branch March 2, 2021 00:46
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.

1 participant