Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

program-test: Add large bootstrap stake for realistic warmups (backport #16739) #16741

Merged
merged 2 commits into from
Apr 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2021

This is an automatic backport of pull request #16739 done by Mergify.

Cherry-pick of f421463 has failed:

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

You are currently cherry-picking commit f4214637a.
  (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:   Cargo.lock
	modified:   program-test/src/lib.rs
	modified:   program-test/tests/warp.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   program-test/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

(cherry picked from commit f421463)

# Conflicts:
#	program-test/Cargo.toml
@mergify mergify bot added the conflicts label Apr 22, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 22, 2021
@codecov
Copy link

codecov bot commented Apr 22, 2021

Codecov Report

Merging #16741 (6bb0d32) into v1.6 (50e441a) will decrease coverage by 0.0%.
The diff coverage is 0.0%.

@@            Coverage Diff            @@
##             v1.6   #16741     +/-   ##
=========================================
- Coverage    82.9%    82.9%   -0.1%     
=========================================
  Files         414      414             
  Lines      114017   114022      +5     
=========================================
- Hits        94555    94540     -15     
- Misses      19462    19482     +20     

@mergify mergify bot merged commit 5f5fa38 into v1.6 Apr 22, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16739 branch April 22, 2021 23:07
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant