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(crypto): error if incorrect ledger public key (backport #1316) #1322

Merged
merged 3 commits into from
Mar 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 27, 2024

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.
  • I have updated API documentation client/docs/swagger-ui/swagger.yaml

This is an automatic backport of pull request #1316 done by [Mergify](https://mergify.com).

(cherry picked from commit e62a330)

# Conflicts:
#	CHANGELOG.md
#	crypto/keyring/keyring.go
@mergify mergify bot added the conflicts label Mar 27, 2024
Copy link
Contributor Author

mergify bot commented Mar 27, 2024

Cherry-pick of e62a330 has failed:

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

You are currently cherry-picking commit e62a33006.
  (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/keyring/keyring_ledger_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   crypto/keyring/keyring.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@0Tech 0Tech self-assigned this Mar 29, 2024
@0Tech 0Tech added C:crypto and removed conflicts labels Mar 29, 2024
CHANGELOG.md Outdated Show resolved Hide resolved
crypto/keyring/keyring.go Outdated Show resolved Hide resolved
Copy link

codecov bot commented Mar 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.78%. Comparing base (a14fa3e) to head (a14fa3e).

❗ Current head a14fa3e differs from pull request most recent head 4a511d7. Consider uploading reports for the commit 4a511d7 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@               Coverage Diff                @@
##           release/v0.48.x    #1322   +/-   ##
================================================
  Coverage            69.78%   69.78%           
================================================
  Files                  646      646           
  Lines                67525    67525           
================================================
  Hits                 47123    47123           
  Misses               18214    18214           
  Partials              2188     2188           

@0Tech 0Tech merged commit c281007 into release/v0.48.x Mar 29, 2024
24 checks passed
@0Tech 0Tech deleted the mergify/bp/release/v0.48.x/pr-1316 branch March 29, 2024 04:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants