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

Cleanup - mock InvokeContext #31007

Merged
merged 7 commits into from
Apr 3, 2023

Conversation

Lichtso
Copy link
Contributor

@Lichtso Lichtso commented Mar 31, 2023

Problem

InvokeContext::new_mock() should not be used externally as it has references to some internals which tend to create messy lifetimes.

Summary of Changes

  • Turns with_mock_invoke_context() into a macro.
  • Removes prepare_mock_invoke_context().
  • Replaces InvokeContext::new_mock() with with_mock_invoke_context().
  • Removes override parameters from mock_process_instruction().
  • Removes Cow from InvokeContext::sysvar_cache.

@Lichtso Lichtso force-pushed the cleanup/mock_invoke_context branch 9 times, most recently from c6ae3ea to f1ee7e1 Compare March 31, 2023 21:34
@codecov
Copy link

codecov bot commented Mar 31, 2023

Codecov Report

Merging #31007 (746f0b1) into master (8c860e9) will decrease coverage by 0.1%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##           master   #31007     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         728      728             
  Lines      205499   205503      +4     
=========================================
- Hits       167599   167584     -15     
- Misses      37900    37919     +19     

@Lichtso Lichtso requested a review from pgarg66 April 1, 2023 10:00
@Lichtso Lichtso force-pushed the cleanup/mock_invoke_context branch 2 times, most recently from 22bcb6f to a646eae Compare April 3, 2023 11:16
@Lichtso Lichtso force-pushed the cleanup/mock_invoke_context branch from a646eae to 746f0b1 Compare April 3, 2023 11:23
@Lichtso Lichtso merged commit a0c7fde into solana-labs:master Apr 3, 2023
@Lichtso Lichtso deleted the cleanup/mock_invoke_context branch April 3, 2023 15:23
jeffwashington pushed a commit to jeffwashington/solana that referenced this pull request Apr 3, 2023
* Turns with_mock_invoke_context() into a macro.

* Removes prepare_mock_invoke_context().

* Replaces InvokeContext::new_mock() with with_mock_invoke_context().

* Removes InvokeContext::new_mock().

* Removes Cow from InvokeContext::sysvar_cache.

* Removes override parameters from mock_process_instruction().

* cargo fmt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants