This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
[PAN-2949] Add rewind to block functionality #1814
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
Retesteth will often request an in-process blockchain be rewound one block so that it can attempt the same test with tweaked parameters. Add support for this.
mbaxter
approved these changes
Aug 1, 2019
| final BlockAddedEvent result = this.handleChainReorg(updater, block); | ||
| updater.commit(); | ||
|
|
||
| if (result.isNewCanonicalHead()) { |
There was a problem hiding this comment.
I think this is always true? Do you need the if / else?
| updater.commit(); | ||
|
|
||
| if (result.isNewCanonicalHead()) { | ||
| chainHeader = block.getHeader(); |
There was a problem hiding this comment.
(optional) You could dedupe this logic by adding a new method like updateCacheForNewCanonicalHead(Block newHead, Supplier<UInt256> td).
| final Block block = new Block(oldBlockHeader.get(), oldBlockBody.get()); | ||
|
|
||
| final BlockchainStorage.Updater updater = blockchainStorage.updater(); | ||
| final BlockAddedEvent result = this.handleChainReorg(updater, block); |
There was a problem hiding this comment.
This change ended up being surprisingly simple 🎉
| } | ||
|
|
||
| final Optional<BlockHeader> oldBlockHeader = blockchainStorage.getBlockHeader(blockHash.get()); | ||
| final Optional<BlockBody> oldBlockBody = blockchainStorage.getBlockBody(blockHash.get()); |
There was a problem hiding this comment.
(optional) If we have the blockHash, should be safe to assume we have the header and body - we should probably throw an exception if they're missing.
| // rewind it by 1 block | ||
| blockchain.rewindToBlock(targetHead.getHeader().getNumber()); | ||
|
|
||
| // Check chain has not reorganized |
There was a problem hiding this comment.
This comment looks wrong :)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR description
Retesteth will often request an in-process blockchain be rewound one block so
that it can attempt the same test with tweaked parameters. Add support for this.