-
Notifications
You must be signed in to change notification settings - Fork 824
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
Allow using get_remaining_points/set_remaining_points without the Metering instance #1941
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
webmaster128
force-pushed
the
metering-manager
branch
2 times, most recently
from
December 16, 2020 11:43
dd500ed
to
ff4a2f3
Compare
jubianchi
reviewed
Dec 16, 2020
webmaster128
force-pushed
the
metering-manager
branch
from
December 17, 2020 12:45
db6e16e
to
44fb48e
Compare
3 tasks
1 task
syrusakbary
approved these changes
Dec 20, 2020
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 23, 2020
1951: feat: Add an error code on the metering middleware r=MarkMcCaskey a=jubianchi _This is a proposition for #1931._ ~~**⚠️ Do not merge as-is. Wait for #1941 to get merged or to provide an alternative**~~ Basically, the metering middleware now injects a new global, `error_code` with its own helper `get_error_code` which will allow the host to correctly handle metering errors. Now, a `remaining_points == 0` and `error_code != NoError` means the execution of the guest module consumed all the gas points. # Review - [ ] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: jubianchi <[email protected]>
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.
Description
In order to be able to use
get_remaining_points
/set_remaining_points
in an ahead of time compilation scenario, those should be acessible withouht the compile time tooling. It turns out this is easy since&self
is never used anyways.In this PR I turn them into free function. I tried static functions first (i.e. calls like
Metering::get_remaining_points(&instance)
), but this brings users in big trouble with respect to generic arguments ofstruct Metering<F: Fn(&Operator) -> u64 + Copy + Clone + Send + Sync>
. We could use a different struct for namespacing purposes (e.g.MeteringManager::get_remaining_points(&instance)
), but this feels like Java style.Review