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.

Sign up for GitHub

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

Jump to bottom

fix!: some cleaning up (backport #2346) #2350

Merged
merged 1 commit into from
Oct 14, 2024
Merged

fix!: some cleaning up (backport #2346) #2350

merged 1 commit into from
Oct 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 14, 2024

Description

Some minor cleaning up on the receipt of a packet.

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
This is an automatic backport of pull request #2346 done by [Mergify](https://mergify.com).

@insumity @mergify
fix!: some cleaning up (#2346)
a92c88d 
* init commit

* Update testing documentation

* took into account comments

* readded slash acks

---------

Co-authored-by: github-actions <[email protected]>
(cherry picked from commit aadfb10)

# Conflicts:
#	scripts/test_doc/test_documentation.md
@mergify mergify bot requested a review from a team as a code owner October 14, 2024 12:52
@mergify mergify bot added the conflicts label Oct 14, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

Cherry-pick of aadfb10 has failed:

On branch mergify/bp/release/v6.2.x/pr-2346
Your branch is up to date with 'origin/release/v6.2.x'.

You are currently cherry-picking commit aadfb107.
  (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:   tests/integration/slashing.go
	modified:   x/ccv/provider/keeper/relay.go
	modified:   x/ccv/provider/keeper/relay_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   scripts/test_doc/test_documentation.md

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

@github-actions github-actions bot added C:Testing Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler C:Build Assigned automatically by the PR labeler labels Oct 14, 2024
@p-offtermatt
Copy link
Contributor

I already approved so that you can merge asap, since the change itself was already reviewed on main

github-advanced-security[bot]
github-advanced-security bot found potential problems Oct 14, 2024
View reviewed changes
tests/integration/slashing.go
// Only reaches the bouncing code if it fails in the check that chain is not launched and in the check that
// the validator is not a consumer validator.
providerKeeper.SetConsumerPhase(suite.providerCtx(), firstBundle.ConsumerId, providertypes.CONSUMER_PHASE_LAUNCHED)
err = providerKeeper.SetConsumerValidator(ctx, firstBundle.ConsumerId, providertypes.ConsensusValidator{

Check warning

Code scanning / CodeQL

Useless assignment to local variable Warning test

This definition of err is never used.
@mpoke mpoke merged commit 8f55cd7 into release/v6.2.x Oct 14, 2024
12 of 14 checks passed
@mpoke mpoke deleted the mergify/bp/release/v6.2.x/pr-2346 branch October 14, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p-offtermatt p-offtermatt p-offtermatt approved these changes

@mpoke mpoke mpoke approved these changes

Assignees

@insumity insumity

Labels
C:Build Assigned automatically by the PR labeler C:Testing Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@p-offtermatt @mpoke @insumity