Merge Development into feat/scheduled-sc-execution plus some gas fix #3705
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
# Conflicts: # cmd/node/config/enableEpochs.toml # node/nodeRunner.go
# Conflicts: # cmd/node/config/enableEpochs.toml # config/epochConfig.go # node/nodeRunner.go
Jailed node should be unstaked if enough validators
get from cache when taking snapshot
# Conflicts: # storage/pruning/pruningStorer.go # storage/pruning/pruningStorer_test.go # testscommon/trie/snapshotPruningStorerStub.go
Arwen 1.4.34
…rrect shard header
…m:ElrondNetwork/elrond-go into merge-snapshot-improvement-feat-scheduled
raduchis
previously approved these changes
Jan 19, 2022
SebastianMarian
previously approved these changes
Jan 19, 2022
AdoAdoAdo
dismissed stale reviews from SebastianMarian and raduchis
via
4119ca9
…d and refunded * Added more logs
…e than max gas accepted in txs dest me (in this case at least one mini block should be accepted, otherwise the shard will be stuck with processing at the current meta block)
AdoAdoAdo
commented
Jan 21, 2022
| @@ -1362,15 +1403,15 @@ func (txs *transactions) ProcessMiniBlock( | |||
| return processedTxHashes, index, err | |||
| } | |||
|
|
|||
| gasProvidedByTxInSelfShard, errComputeGas := txs.computeGasProvided( | |||
| gasProvidedByTxInSelfShard, err = txs.computeGasProvided( | |||
SebastianMarian
previously approved these changes
Jan 21, 2022
raduchis
previously approved these changes
Jan 21, 2022
AdoAdoAdo
dismissed stale reviews from raduchis and SebastianMarian
via
a9b7da3
raduchis
previously approved these changes
Jan 21, 2022
iulianpascalau
previously approved these changes
Jan 21, 2022
|
|
||
| for index := range miniBlockScrs { | ||
| if !haveTime() { | ||
| err = process.ErrTimeIsOut | ||
| return processedTxHashes, index, err | ||
| } | ||
|
|
||
| gasProvidedByTxInSelfShard, errComputeGas := scr.computeGasProvided( | ||
| gasProvidedByTxInSelfShard, err = scr.computeGasProvided( |
There was a problem hiding this comment.
This is a main reason that using defer function that handles an internal err variable is a bad practice.
This should have been split in at least 3 functions:
scr.processSomethingWithoutErrHandling()
err := scr.processOtherStuffWithErrHandling()
scr.handleErr(err)In this way the intent will be better shown and the code would have been more robust
We should stop writing code like this and refactor wherever we can this.
raduchis
previously approved these changes
Jan 21, 2022
SebastianMarian
dismissed stale reviews from raduchis and iulianpascalau
via
53f5824
SebastianMarian
approved these changes
Jan 21, 2022
raduchis
approved these changes
Jan 21, 2022
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.
No description provided.