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

Refactor: Improve type safety and readability of transaction execution (backport #22215)#22289

Merged
jstarry merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22215
Jan 5, 2022
Merged

Refactor: Improve type safety and readability of transaction execution (backport #22215)#22289
jstarry merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22215

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 5, 2022

This is an automatic backport of pull request #22215 done by Mergify.
Cherry-pick of 45458e7 has failed:

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

You are currently cherry-picking commit 45458e713.
  (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:   core/src/banking_stage.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   program-test/src/lib.rs
	modified:   rpc/src/transaction_status_service.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/bank_utils.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/bpf/benches/bpf_loader.rs
	both modified:   programs/bpf/tests/programs.rs
	both modified:   runtime/src/bank.rs

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 conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 5, 2022
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 5, 2022

Codecov Report

Merging #22289 (45458e7) into v1.9 (87f4a1f) will increase coverage by 0.0%.
The diff coverage is 65.6%.

❗ Current head 45458e7 differs from pull request most recent head 561e1b6. Consider uploading reports for the commit 561e1b6 to get more accurate results

@@            Coverage Diff            @@
##             v1.9   #22289     +/-   ##
=========================================
  Coverage    81.1%    81.1%             
=========================================
  Files         518      523      +5     
  Lines      145136   146830   +1694     
=========================================
+ Hits       117708   119095   +1387     
- Misses      27428    27735    +307     

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

automerge label removed due to a CI failure

@jstarry jstarry force-pushed the mergify/bp/v1.9/pr-22215 branch from 4bb108e to 561e1b6 Compare January 5, 2022 11:52
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

automerge label removed due to a CI failure

@jstarry jstarry merged commit 8578429 into v1.9 Jan 5, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22215 branch January 5, 2022 15:01
brooksprumo added a commit to brooksprumo/solana that referenced this pull request Jan 5, 2022
brooksprumo added a commit that referenced this pull request Jan 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants