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

[CORE-709] do not error when completing a bridge with non-positive amount (backport #691) #707

Merged
merged 2 commits into from
Oct 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2023

This is an automatic backport of pull request #691 done by Mergify.
Cherry-pick of 525873d has failed:

On branch mergify/bp/release/protocol/v1.x/pr-691
Your branch is up to date with 'origin/release/protocol/v1.x'.

You are currently cherry-picking commit 525873de.
  (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:   protocol/x/bridge/keeper/complete_bridge.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   protocol/x/bridge/keeper/complete_bridge_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

…ount (#691)

* do not error when completing a bridge with non-positive amount

(cherry picked from commit 525873d)

# Conflicts:
#	protocol/x/bridge/keeper/complete_bridge_test.go
@mergify mergify bot added the conflicts label Oct 25, 2023
@mergify mergify bot assigned tqin7 Oct 25, 2023
@linear
Copy link

linear bot commented Oct 25, 2023

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 25, 2023

Important

Auto Review Skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai help to get help.

Note: For conversation with the bot, please use the review comments on code diffs or files.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.json

@tqin7 tqin7 merged commit ff6cc42 into release/protocol/v1.x Oct 26, 2023
@tqin7 tqin7 deleted the mergify/bp/release/protocol/v1.x/pr-691 branch October 26, 2023 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

1 participant