split preparation code into per-version modules #8839
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ekleog-NEAR
added
the
C-housekeeping
nagisa
reviewed
Mar 29, 2023
| @@ -109,301 +34,13 @@ fn validate_contract(code: &[u8], config: &VMConfig) -> Result<(), PrepareError> | |||
| /// | |||
| /// The preprocessing includes injecting code for gas metering and metering the height of stack. | |||
| pub fn prepare_contract(original_code: &[u8], config: &VMConfig) -> Result<Vec<u8>, PrepareError> { | |||
| validate_contract(original_code, config)?; | |||
| prepare_v1::validate_contract(original_code, config)?; | |||
There was a problem hiding this comment.
Should move this into prepare_contract for each version (even if v0 continues calling v1's validate_contract)
There was a problem hiding this comment.
Yup! I’ve been trying to minimize changes here, keeping the same code structure, this will come along with the introduction of contract prep v2 :)
nagisa
approved these changes
Mar 29, 2023
nikurt
pushed a commit
to nikurt/nearcore
that referenced
this pull request
Apr 5, 2023
This is literally just cut-paste and adjust to calling the right functions for now. Further changes to get to the end-state of near#8323 will come later
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is literally just cut-paste and adjust to calling the right functions for now. Further changes to get to the end-state of #8323 will come later