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

feat: fix equivocation e2e-test + fix CLI #2248

Merged
merged 10 commits into from
Sep 11, 2024
Merged

feat: fix equivocation e2e-test + fix CLI #2248

merged 10 commits into from
Sep 11, 2024

Conversation

sainoe
Copy link
Contributor

@sainoe sainoe commented Sep 10, 2024

Make consumer equivocation e2e-test to pass without using Hermes and fix bug in CLI.

Description

Closes: #XXXX


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 in the PR title
  • Added ! to the type prefix if the change is state-machine breaking
  • Confirmed this PR does not introduce changes requiring state migrations, OR migration code has been added to consumer and/or provider modules
  • Targeted the correct branch (see PR Targeting)
  • Provided a link to the relevant issue or specification
  • Followed the guidelines for building SDK modules
  • Included the necessary unit and integration tests
  • Added a changelog entry to CHANGELOG.md
  • Included comments for documenting Go code
  • Updated the relevant documentation or specification
  • Reviewed "Files changed" and left comments if necessary
  • Confirmed all CI checks have passed
  • If this PR is library API breaking, bump the go.mod version string of the repo, and follow through on a new major release

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 in the PR title
  • confirmed ! the type prefix if the change is state-machine breaking
  • confirmed this PR does not introduce changes requiring state migrations, OR confirmed migration code has been added to consumer and/or provider modules
  • 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

@sainoe sainoe requested a review from a team as a code owner September 10, 2024 15:42
@github-actions github-actions bot added C:Testing Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler labels Sep 10, 2024
tests/e2e/actions.go Outdated Show resolved Hide resolved
// the Hermes doesn't support evidence handling for Permissionless ICS yet
// TODO: @Simon refactor once https://github.com/informalsystems/hermes/pull/4182 is merged.
if useRelayer {
// run in detached mode so it will keep running in the background
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understood correctly, it seems that if !useRelayer, we do not run this in the background but check if there's currently evidence. If so, it might make sense to rename startConsumerEvidenceDetector to something like detectEvidence.... If that's the case, maybe we should run Hermes in a similar way here and not in detached mode.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point! Renamed to detectConsumerEvidenceAction

Copy link
Contributor

@insumity insumity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Simon!

LGTM

Copy link
Contributor

@mpoke mpoke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

sainoe and others added 2 commits September 11, 2024 16:11
Co-authored-by: insumity <karolos@informal.systems>
gas,
)

cmd = tr.target.ExecCommand(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why a bash command?

Copy link
Contributor Author

@sainoe sainoe Sep 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find it easier to execute a long command that way.

if err == nil {
evidence := gjson.Get(string(bz), "evidence")
if len(evidence.Array()) > 0 {
infractionHeight = evidence.Array()[0].Get("value.height").Int()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could it be that the one we're looking for is not the first entry in the list?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We expect only one evidence. I'll update the condition above to reflect this!

tests/e2e/actions.go Outdated Show resolved Hide resolved
log.Fatal("expected at least one evidence in block but found zero")
}

if equivocation := evidence[0].Get("duplicate_vote_evidence"); equivocation.String() != "" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also here, should we iterate over the list until we find a "duplicate_vote_evidence"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could but it's simpler to return an error if the evidence isn't of the duplicate vote evidence type since we expect only one evidence.

sainoe and others added 2 commits September 11, 2024 16:42
Co-authored-by: bernd-m <43466467+bermuell@users.noreply.github.com>
@mpoke mpoke disabled auto-merge September 11, 2024 16:45
@mpoke mpoke merged commit 804b53b into main Sep 11, 2024
14 of 15 checks passed
@mpoke mpoke deleted the sainoe/e2e-equivocation branch September 11, 2024 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:Testing Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants