[ETCM-964] Fix preimage cache to make vmArithmeticTest pass #1029
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
AurelienRichez
commented
Jun 29, 2021
| @@ -81,6 +73,18 @@ class BlockExecution( | |||
| } yield execResult.copy(worldState = worldPersisted) | |||
| } | |||
|
|
|||
| protected def buildInitialWorld(block: Block, parentHeader: BlockHeader): InMemoryWorldStateProxy = { | |||
There was a problem hiding this comment.
ok this is weird. apparently this simple change causes this error :
[error] /.../mantis/src/main/scala/io/iohk/ethereum/ledger/BlockExecution.scala:146:3: Could not find a
ny member to link for "BlockExecutionError".
[error] /** Executes and validates a list of blocks, storing the results in the blockchain.
[error] ^
[error] one error found
[error] Scaladoc generation failed
The class is mentioned in the scaladoc, and replacing it with a full name with the namespace solves the problem. But I don't really understand how this change causes a problem.
jvdp
approved these changes
Jun 29, 2021
| @@ -131,6 +130,8 @@ class TestService( | |||
| private var currentConfig: BlockchainConfig = initialConfig | |||
| private var blockTimestamp: Long = 0 | |||
| private var sealEngine: SealEngineType = SealEngineType.NoReward | |||
| private val preimageCache: collection.concurrent.Map[ByteString, UInt256] = | |||
There was a problem hiding this comment.
Looks like this preimageCache is used to store only storage data. If that's the case it would make sense to make this obvious from the type definition by using AnyVal wrappers for ByteString and UInt256 like say StorageHash, StorageKey
lukasz-golebiewski
approved these changes
Jun 30, 2021
# for free
to join this conversation on GitHub.
Already have an account?
# 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
We accidentally removed the storage key preimage cache in test mode during our refactoring, which broke lots of ETS tests.
This PR fixes that to make those ETS test work again