Revise AionBlockStore for supporting unity-protocol #981
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
AionJayT
force-pushed
the
unity-master
branch
2 times, most recently
from
18684d2
to
7dcc1f0
Compare
AlexandraRoatis
suggested changes
Sep 12, 2019
| @@ -3,6 +3,7 @@ | |||
| import static com.google.common.truth.Truth.assertThat; | |||
| import static org.aion.zero.impl.blockchain.BlockchainTestUtils.generateRandomChain; | |||
| import static org.aion.zero.impl.blockchain.BlockchainTestUtils.generateRandomChainWithoutTransactions; | |||
| import static org.junit.Assert.assertNull; | |||
| } else { | ||
| System.out.print(" " + shortHash(blockInfo.getHash()) + " "); | ||
| } | ||
| @SuppressWarnings("unchecked") |
There was a problem hiding this comment.
This has not changed, so it shouldn't be part of the diff.
| @@ -1511,140 +1796,199 @@ public void load() { | |||
| } | |||
|
|
|||
| public enum IntegrityCheckResult { | |||
| ERROR, | |||
| MISSING_GENESIS, | |||
| MISSING_LEVEL, | |||
| FIXED, | |||
| CORRECT | |||
| } | |||
|
|
|||
| public IntegrityCheckResult indexIntegrityCheck() { | |||
There was a problem hiding this comment.
It would be preferable to disable this and write an issue to add tests. Without tests to ensure correctness, this may end up corrupting the database.
| @@ -2084,7 +2087,8 @@ public synchronized boolean recoverIndexEntry(Repository repository, Block block | |||
| other.getShortHash(), | |||
| other.getNumber(), | |||
| other.getTransactionsList().size()); | |||
| totalDiff = repo.getBlockStore().correctIndexEntry(other, totalDiff); | |||
| //TODO: [unity] revise it after the blockchainImpl class introducing the unity difficulty concept | |||
| totalDiff = repo.getBlockStore().correctIndexEntry(other, totalDiff, BigInteger.ONE).getCumulativeDifficulty(); | |||
There was a problem hiding this comment.
This recovery option should be disabled and an issue created to re-enable it with tests for correct functionality with staking blocks.
AionJayT
force-pushed
the
unity-master
branch
from
7dcc1f0
to
c015db5
Compare
AionJayT
force-pushed
the
unity-master
branch
from
c015db5
to
0d59bba
Compare
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.
Notice
Please submit your PR to the
masterbranch and rebase your code onmasterbefore opening the pull request.Description
Please include a brief summary of the change that this pull request proposes. Include any relevant motivation and context. List any dependencies required for this change.
Fixes Issue # .
Type of change
Insert x into the following checkboxes to confirm (eg. [x]):
Testing
Please describe the tests you used to validate this pull request. Provide any relevant details for test configurations as well as any instructions to reproduce these results.