Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2023

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

On branch mergify/bp/v0.38.x/pr-1750
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit b70c4ab96.
  (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:   blocksync/reactor.go
	modified:   evidence/pool.go
	modified:   evidence/verify.go
	modified:   test/e2e/app/app.go
	modified:   test/e2e/runner/evidence.go
	modified:   types/validation.go
	modified:   types/validator_set.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   types/validation_test.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.com

… signatures (#1750)

* [e2e] Repro evidence bug: not checking all signatures

* _Only_ callsites in the light client should be skipping verification of commit signatures

* Address PR comments

* Rename UT

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
(cherry picked from commit b70c4ab)

# Conflicts:
#	types/validation_test.go
@mergify mergify bot requested a review from a team as a code owner December 11, 2023 08:43
@mergify mergify bot added the conflicts label Dec 11, 2023
sergio-mena and others added 2 commits December 11, 2023 19:56
… signatures (#1750)

* [e2e] Repro evidence bug: not checking all signatures

* _Only_ callsites in the light client should be skipping verification of commit signatures

* Address PR comments

* Rename UT

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
@sergio-mena sergio-mena self-assigned this Dec 11, 2023
@sergio-mena sergio-mena merged commit f5da30d into v0.38.x Dec 11, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.38.x/pr-1750 branch December 11, 2023 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant