Fixed recreate trie in sc query service #5983
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 +33,7 @@ var logQueryService = logger.GetOrCreate("process/smartcontract.queryService") | |||
|
|
|||
| // MaxGasLimitPerQuery - each unit is the equivalent of 1 nanosecond processing time | |||
| const MaxGasLimitPerQuery = 300_000_000_000 | |||
| const epochDifferenceToConsiderHistory = 2 | |||
There was a problem hiding this comment.
All right to be a constant here, for all practical purposes 👍
|
|
||
| func (service *SCQueryService) getCurrentEpoch() uint32 { | ||
| header := service.mainBlockChain.GetCurrentBlockHeader() | ||
| if check.IfNil(header) { |
There was a problem hiding this comment.
Assuming this is not a happy & common case, all good.
There was a problem hiding this comment.
this actually used at genesis time
| argsNewSCQuery.MainBlockChain = &testscommon.ChainHandlerStub{ | ||
| GetCurrentBlockHeaderCalled: func() data.HeaderHandler { | ||
| return &block.Header{ | ||
| Epoch: 37, |
| GetFromEpochCalled: func(key []byte, epoch uint32) ([]byte, error) { | ||
| counter++ | ||
| if counter > 2 { | ||
| return nil, fmt.Errorf("no scheduled") |
There was a problem hiding this comment.
Out of context message?
|
|
||
| _, _, err := target.ExecuteQuery(&query) | ||
| assert.True(t, runWasCalled) | ||
| assert.True(t, wasRecreateTrieCalled) |
There was a problem hiding this comment.
recreateTrieWasCalled - for consistency with runWasCalled.
| providedHash := []byte("provided hash") | ||
| providedRootHash := []byte("provided root hash") | ||
| argsNewSCQuery.Marshaller = &marshallerMock.MarshalizerMock{} | ||
| counter := 0 |
There was a problem hiding this comment.
Can be renamed to getFromEpochCallsCounter (if makes sense).
Oh, now I see, can be left as it is - seen in other tests, as well.
There was a problem hiding this comment.
removed, anyway
| }, | ||
| GetFromEpochCalled: func(key []byte, epoch uint32) ([]byte, error) { | ||
| counter++ | ||
| if counter > 2 { |
There was a problem hiding this comment.
Out of context message?
| assert.Nil(t, err) | ||
| assert.True(t, recreateTrieCalled) | ||
| }) | ||
| t.Run("should call RecreateTrieFromEpoch for block on epoch 3", func(t *testing.T) { |
andreibancioiu
approved these changes
Feb 20, 2024
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?