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!: add feegranter option to txsim (backport #2291) #2309

Merged
merged 2 commits into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #2291 done by Mergify.
Cherry-pick of 33536b0 has failed:

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

You are currently cherry-picking commit 33536b0.
  (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:   app/test/square_size_test.go
	modified:   test/cmd/txsim/cli.go
	modified:   test/txsim/account.go
	modified:   test/txsim/blob.go
	modified:   test/txsim/run.go
	modified:   test/txsim/run_test.go
	modified:   test/txsim/send.go
	modified:   test/txsim/sequence.go
	modified:   test/txsim/stake.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/e2e/simple_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

## Overview

This PR adds feegrant back to txsim. Except this time instead of only
using feegrant, we now have feegrant as an option. This way we can test
without it enabled, which keeps our testing environments _slightly_ more
realistic while still being able to enable it when convient. This is
particularly useful when we don't want to send gobs of testnet tokens
around or have a very long running sequence.

closes #2289
blocking #2197

(cherry picked from commit 33536b0)

# Conflicts:
#	test/e2e/simple_test.go
rootulp
rootulp previously approved these changes Aug 17, 2023
@rootulp rootulp enabled auto-merge (squash) August 17, 2023 18:35
@github-actions github-actions bot added the bot item was created by a bot label Aug 17, 2023
@MSevey MSevey requested a review from a team August 17, 2023 18:44
@rootulp rootulp removed the conflicts label Aug 17, 2023
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (v1.x@581c3e7). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.x    #2309   +/-   ##
=======================================
  Coverage        ?   20.97%           
=======================================
  Files           ?      137           
  Lines           ?    15314           
  Branches        ?        0           
=======================================
  Hits            ?     3212           
  Misses          ?    11796           
  Partials        ?      306           

@rootulp rootulp merged commit ce4c49a into v1.x Aug 17, 2023
20 checks passed
@rootulp rootulp deleted the mergify/bp/v1.x/pr-2291 branch August 17, 2023 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants