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 the ability to specifiy the txsim master account (backport #2292) #2299

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 #2292 done by Mergify.
Cherry-pick of 2102189 has failed:

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

You are currently cherry-picking commit 2102189.
  (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/run.go
	modified:   test/txsim/run_test.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 the ability to specify a specific account to use as master
for txsim. This is useful for when we don't want to always use the
account with the most funds in our wallet.

closes #2286
kinda sorta blocking #2197

## Checklist

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [x] Linked issues closed with keywords

(cherry picked from commit 2102189)

# Conflicts:
#	test/e2e/simple_test.go
@mergify mergify bot added the conflicts label Aug 17, 2023
@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 13:48
@codecov-commenter
Copy link

Codecov Report

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

@@           Coverage Diff           @@
##             v1.x    #2299   +/-   ##
=======================================
  Coverage        ?   21.41%           
=======================================
  Files           ?      132           
  Lines           ?    14720           
  Branches        ?        0           
=======================================
  Hits            ?     3153           
  Misses          ?    11264           
  Partials        ?      303           

@evan-forbes evan-forbes merged commit 6a06268 into v1.x Aug 17, 2023
21 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2292 branch August 17, 2023 16:22
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