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

Cleanup #22182#22205

Merged
Lichtso merged 4 commits intosolana-labs:masterfrom
Lichtso:cleanup/pr_22182
Dec 31, 2021
Merged

Cleanup #22182#22205
Lichtso merged 4 commits intosolana-labs:masterfrom
Lichtso:cleanup/pr_22182

Conversation

@Lichtso
Copy link
Copy Markdown
Contributor

@Lichtso Lichtso commented Dec 31, 2021

Problem

#22182 was made right in between my program-runtime refactorings (see #22165 and https://github.com/Lichtso/solana/tree/refactor/remove_keyed_account_from_program_runtime), and is based on an incomplete state of the program-runtime in transition. Together with the earlier #22059, its revert #22174 and its fix #22202 lead to heavy merge conflicts three times now. Thus, I split the adoption of my refactoring to that up, into this PR.

Summary of Changes

  • Turns compute_units_consumed of ProcessInstructionResult into a &mut parameter.
  • Unifies test_process_cross_program(), test_native_invoke() and test_process_instruction_compute_budget() into test_process_instruction().

Fixes #

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 31, 2021

Codecov Report

Merging #22205 (153cbde) into master (94a9b71) will decrease coverage by 0.0%.
The diff coverage is 94.7%.

@@            Coverage Diff            @@
##           master   #22205     +/-   ##
=========================================
- Coverage    81.1%    81.0%   -0.1%     
=========================================
  Files         523      523             
  Lines      146609   146487    -122     
=========================================
- Hits       118904   118748    -156     
- Misses      27705    27739     +34     

@Lichtso Lichtso merged commit e529d03 into solana-labs:master Dec 31, 2021
@Lichtso Lichtso deleted the cleanup/pr_22182 branch December 31, 2021 16:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant