AIP forkproperties #710
Merged
AIP forkproperties #710
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
AIP_forkproperties
branch
from
b58d21d to
fc6fc9e
Compare
beidouz
force-pushed
the
AIP_forkproperties
branch
from
fc6fc9e to
0dc8939
Compare
iamyulong
suggested changes
Nov 20, 2018
AionJayT
requested review from
AlexandraRoatis,
aion-kelvin,
arajasek,
qoire and
iamyulong
iamyulong
approved these changes
Nov 21, 2018
aion-kelvin
reviewed
Nov 21, 2018
aion-kelvin
approved these changes
Nov 21, 2018
AlexandraRoatis
suggested changes
Nov 21, 2018
| @@ -214,6 +227,7 @@ private void updateNetworkExecPaths() { | |||
| networkConfigDir = new File(CONFIG_DIR, network); | |||
| baseConfigFile = new File(networkConfigDir, configFileName); | |||
| baseGenesisFile = new File(networkConfigDir, genesisFileName); | |||
| baseForkFile = new File(networkConfigDir, forkFileName); | |||
There was a problem hiding this comment.
The fork files need to be initialized for the case where the config files reside directly in the config folder as used by old kernels (implemented in else clause at line 210 above). I propose that we assume that anyone using the old config location takes the time to copy the fork.properties file.
modPrecompiled/test/org/aion/precompiled/contracts/Blake2bHashTest.java
Outdated
Show resolved
Hide resolved
| @@ -102,6 +102,11 @@ | |||
| private static final File mainnetGenesis = new File(MAIN_CONFIG_PATH, genesisFileName); | |||
| private static final File testnetGenesis = new File(TEST_CONFIG_PATH, genesisFileName); | |||
|
|
|||
| private static final File fork = new File(TEST_RESOURCE_DIR, forkFileName); | |||
| private static final File oldFork = new File(CONFIG_PATH, forkFileName); | |||
There was a problem hiding this comment.
need a test for behavior with old kernels config using the variable above
There was a problem hiding this comment.
disable to support the old config compatibility for the fork. And will put it in the release note.
arajasek
approved these changes
Nov 21, 2018
AlexandraRoatis
approved these changes
Nov 22, 2018
Config migration
Move modBoost/resource to config
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
It is not allowed to submit your PR to the master branch directly, please submit your PR to the master-pre-merge branch.
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.
Verification
Insert x into the following checkboxes to confirm (eg. [x]):