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(x/twap): incorrect time delta due to nanoseconds in time (backport #4359) #4374

Merged
merged 1 commit into from
Feb 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2023

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

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

You are currently cherry-picking commit f56280f4.
  (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/e2e/e2e_test.go
	modified:   x/twap/keeper_test.go
	modified:   x/twap/logic.go
	modified:   x/twap/logic_test.go
	modified:   x/twap/strategy.go
	modified:   x/twap/strategy_test.go
	modified:   x/twap/types/utils.go
	modified:   x/twap/types/utils_test.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/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

@mergify mergify bot added the conflicts label Feb 20, 2023
@mergify mergify bot assigned p0mvn Feb 20, 2023
@github-actions github-actions bot added the C:x/twap Changes to the twap module label Feb 20, 2023
@p0mvn p0mvn force-pushed the mergify/bp/v15.x/pr-4359 branch from 13dcef6 to 649d1c6 Compare February 20, 2023 16:30
@p0mvn p0mvn merged commit ef53a61 into v15.x Feb 20, 2023
@p0mvn p0mvn deleted the mergify/bp/v15.x/pr-4359 branch February 20, 2023 16:42
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
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant