Remove support for storage layout v9 #2372
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
This PR drops support for storage layout v9. The following simplifications are implemented as well: * Drop the `Option` fields from `PersistentState`. These were only kept for stable memory compatibility with v8. * Make loading the `PersistentState` infallible. * Moved initialization of default values from `StorablePersistentState` to `PersistentState`.
| @@ -16,10 +16,7 @@ use std::cmp::min; | |||
| /// There is a maximum of `max_tokens` tokens, when reached the tokens not increase any further. | |||
| /// This is the maximum number of calls that can be handled in a burst. | |||
| pub fn process_rate_limit() { | |||
| let Some(config) = state::persistent_state(|ps| ps.registration_rate_limit.clone()) else { | |||
| // rate limit disabled -> nothing to do | |||
There was a problem hiding this comment.
Rate limit can no longer be not enabled.
| @@ -138,106 +138,103 @@ fn persistent_state_metrics( | |||
| w: &mut MetricsEncoder<Vec<u8>>, | |||
| persistent_state: &PersistentState, | |||
| ) -> Result<(), std::io::Error> { | |||
| if let Some(ref register_rate_limit_config) = persistent_state.registration_rate_limit { | |||
| let register_rate_limit_config = &persistent_state.registration_rate_limit; | |||
There was a problem hiding this comment.
The diff in this file is just unnesting if let Some(..) = ... { constructs
| // immediately migrate the persistent state to the new layout | ||
| state::storage_borrow_mut(|storage| storage.migrate_persistent_state()); | ||
| // load the persistent state after initializing storage, otherwise the memory address to load it from cannot be calculated | ||
| state::load_persistent_state(); |
There was a problem hiding this comment.
I moved loading the persistent state upwards, because logically it seems to make more sense. In the future, I'll include it in the init_from_stable_memory function to make it a single action.
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 PR drops support for storage layout v9. The following simplifications are implemented as well:
Optionfields fromPersistentState. These were only kept for stable memory compatibility with v8.PersistentStateinfallible.StorablePersistentStatetoPersistentState.🟡 Some screens were changed