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

Remove using an iterator from updating TWAP records (backport #7266) #7403

Merged
merged 2 commits into from
Feb 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #7266 done by Mergify.
Cherry-pick of 9193ee4 has failed:

On branch mergify/bp/v21.x/pr-7266
Your branch is up to date with 'origin/v21.x'.

You are currently cherry-picking commit 9193ee48.
  (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:   x/twap/logic.go
	modified:   x/twap/store.go
	modified:   x/twap/store_test.go
	modified:   x/twap/types/keys.go

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


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

* Remove using an iterator from updating TWAP records

* Changelog

* Add test case

---------

Co-authored-by: mattverse <[email protected]>
Co-authored-by: Matt, Park <[email protected]>
(cherry picked from commit 9193ee4)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Feb 2, 2024
@github-actions github-actions bot added the C:x/twap Changes to the twap module label Feb 2, 2024
@p0mvn p0mvn merged commit c7f51ba into v21.x Feb 3, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v21.x/pr-7266 branch February 3, 2024 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:x/twap Changes to the twap module conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants