New enable epochs handler functionality #5417
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
| @@ -33,6 +36,9 @@ func NewEnableEpochsHandler(enableEpochsConfig config.EnableEpochs, epochNotifie | |||
|
|
|||
| // EpochConfirmed is called whenever a new epoch is confirmed | |||
| func (handler *enableEpochsHandler) EpochConfirmed(epoch uint32, _ uint64) { | |||
| atomic.StoreUint32(&handler.currentEpoch, epoch) | |||
There was a problem hiding this comment.
this function is concurrent safe. However, I was wondering if making it a critical section will help when we can have concurrent EpochConfirmed calls and the internal flags will have non-deterministic values.
We should never have concurrent EpochConfirmed calls but we never know how the code will change,
| return epoch >= handler.enableEpochsConfig.SwitchHysteresisForMinNodesEnableEpoch | ||
| } | ||
|
|
||
| // IsSwitchHysteresisForMinNodesFlagEnabledInSpecificEpochOnly returns true if SwitchHysteresisForMinNodesEnableEpoch is the provided epoch |
| } | ||
|
|
||
| // IsSaveToSystemAccountFlagEnabledInEpoch returns true if OptimizeNFTStoreEnableEpoch is lower than the provided epoch | ||
| // this is a duplicate for OptimizeNFTStoreEnableEpoch needed for consistency into vm-common |
There was a problem hiding this comment.
do we still need the OptimizeNFTStoreEnableEpoch value?
Valid also for OptimizeNFTStoreEnableEpoch
There was a problem hiding this comment.
for the moment I just duplicated all the methods and then integrate one by one.. unused methods will be removed in further PRs
| @@ -140,109 +141,111 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) { | |||
| handler, _ := NewEnableEpochsHandler(cfg, &epochNotifier.EpochNotifierStub{}) | |||
| require.False(t, check.IfNil(handler)) | |||
|
|
|||
| handler.EpochConfirmed(math.MaxUint32, 0) | |||
| currentEpoch := uint32(math.MaxUint32 - 1) | |||
| handler.EpochConfirmed(currentEpoch, 0) | |||
There was a problem hiding this comment.
I think we can remove this call and change all the other calls to use currentEpoch instead of math.MaxUint32
| @@ -259,107 +262,108 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) { | |||
|
|
|||
| handler.EpochConfirmed(epoch, 0) | |||
There was a problem hiding this comment.
this can be removed
| assert.True(t, handler.IsTransferToMetaFlagEnabled()) | ||
| assert.True(t, handler.IsESDTNFTImprovementV1FlagEnabled()) | ||
| assert.True(t, handler.FixDelegationChangeOwnerOnAccountEnabled()) | ||
| assert.True(t, handler.IsSCDeployFlagEnabledInEpoch(math.MaxUint32)) |
There was a problem hiding this comment.
test against the epoch value, not math.MaxUint32
| @@ -371,107 +375,108 @@ func TestNewEnableEpochsHandler_EpochConfirmed(t *testing.T) { | |||
|
|
|||
| handler.EpochConfirmed(epoch, 0) | |||
| assert.False(t, handler.IsScheduledMiniBlocksFlagEnabled()) | ||
| assert.False(t, handler.IsCorrectJailedNotUnStakedEmptyQueueFlagEnabled()) | ||
| assert.False(t, handler.IsDoNotReturnOldBlockInBlockchainHookFlagEnabled()) | ||
| assert.False(t, handler.IsSCDeployFlagEnabledInEpoch(0)) |
There was a problem hiding this comment.
test against epoch, not 0
ssd04
reviewed
Jul 10, 2023
Comment on lines
383
to
391
| // IsCorrectLastUnJailedFlagEnabledInEpoch returns true if correctLastUnJailedFlag is lower than the provided epoch | ||
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInEpoch(epoch uint32) bool { | ||
| return epoch >= handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | ||
| } | ||
|
|
||
| // IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly returns true if correctLastUnJailedCurrentEpochFlag is the provided epoch | ||
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly(epoch uint32) bool { | ||
| return epoch == handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | ||
| } |
There was a problem hiding this comment.
Suggested change
| // IsCorrectLastUnJailedFlagEnabledInEpoch returns true if correctLastUnJailedFlag is lower than the provided epoch | |
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInEpoch(epoch uint32) bool { | |
| return epoch >= handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | |
| } | |
| // IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly returns true if correctLastUnJailedCurrentEpochFlag is the provided epoch | |
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly(epoch uint32) bool { | |
| return epoch == handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | |
| } | |
| // IsCorrectLastUnJailedFlagEnabledInEpoch returns true if CorrectLastUnjailedEnableEpoch is lower than the provided epoch | |
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInEpoch(epoch uint32) bool { | |
| return epoch >= handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | |
| } | |
| // IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly returns true if CorrectLastUnjailedEnableEpoch is the provided epoch | |
| func (handler *enableEpochsHandler) IsCorrectLastUnJailedFlagEnabledInSpecificEpochOnly(epoch uint32) bool { | |
| return epoch == handler.enableEpochsConfig.CorrectLastUnjailedEnableEpoch | |
| } |
change comments to have the same pattern as for the others?
There was a problem hiding this comment.
right, missed them
iulianpascalau
approved these changes
Jul 11, 2023
ssd04
approved these changes
Jul 11, 2023
sstanculeanu
merged commit 74e1f27
into
feat/refactor_enable_epochs_handler
5 checks passed
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.
Reasoning behind the pull request
Proposed changes
Testing procedure
Pre-requisites
Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:
featbranch created?featbranch merging, do all satellite projects have a proper tag insidego.mod?