IRI can be now deployed as testnet or mainnet compatible #610
Conversation
src/main/java/com/iota/iri/IRI.java
Outdated
| @@ -143,7 +143,6 @@ private static void validateParams(final Configuration configuration, final Stri | |||
| configuration.put(DefaultConfSettings.COORDINATOR, Configuration.TESTNET_COORDINATOR_ADDRESS); | |||
| configuration.put(DefaultConfSettings.SNAPSHOT_FILE, Configuration.TESTNET_SNAPSHOT_FILE); | |||
| configuration.put(DefaultConfSettings.MILESTONE_START_INDEX, Configuration.TESTNET_MILESTONE_START_INDEX); | |||
| configuration.put(DefaultConfSettings.SNAPSHOT_SIGNATURE_FILE, Configuration.TESTNET_SNAPSHOT_SIG_FILE); | |||
There was a problem hiding this comment.
I understand the reasoning here - that snapshotTestnet.sig is not validated so there is no need to point to it,
However, his means that snapshotMainnet.sig will be read also for testnet, even if the signature is not validated it still mixes file names.
better to set as null / ""
There was a problem hiding this comment.
set to "".
I think null will raise an exception when inserted as a value to ConcurrentHashMap<>
| try { | ||
| InputStream inputStream = SignedFiles.class.getResourceAsStream(filename); | ||
| if (inputStream == null) { | ||
| inputStream = new FileInputStream(filename); |
There was a problem hiding this comment.
add a comment to explicitly state that if a path is not in resources, then reading the file from OS.
There was a problem hiding this comment.
Added similar comment in Snapshot.java as well
| private static InputStream getSnapshotStream(String snapshotPath) throws FileNotFoundException { | ||
| InputStream inputStream = Snapshot.class.getResourceAsStream(snapshotPath); | ||
| if (inputStream == null) { | ||
| inputStream = new FileInputStream(snapshotPath); |
There was a problem hiding this comment.
same comment as in signedFiles
|
Sanity tests were performed |
|
Nice work! Let me know if you need help with |
Note
Since the object of this PR is to help getting PRs get merged quickly, without creating too many conflicts with the PRs that are now waiting in queue. This fix is quick and dirty.
When
Configurationwill be refactored we will no longer have to pass values via constructors and methods. In the meanwhile when you review the code try to concentrate on things that break functionality.Description
A prerequisite for merging a PR, no matter how small and benign it seems, is to let it mature on the testnet. This hinders the mergers of PRs to this branch.
We are now creating a new process that will allow PRs to be merged quickly after they passed a review and basic sanity tests. In order to make this process work IRI code should be able to take the roll of a testnet deployment. Even though there is a
--testnetflag, manual changes were required.This change involves 3 commits:
--testnet flagthe ability to deploy iri as testnet. New flags were also introduced that will enable to run IRI in a customized private testnet.List of new flags:
--testnet: [bool] flag to trigger further non-mainnet config
--testnet-coordinator: [string] coo address (no checksum)
--testnet-no-coo-validation: [bool] signature validation on/off
--snapshot: [file path] [default snapshotMainnet.txt/snapshotTestnet.txt]
--snapshot-sig: [file path] [default snapshotMainnet.sig/snapshotTestnet.sig] (although on testnet the signature is not verified)
--mwm: [int] [default 14/9] [min 13/0] [max ~/9]
--milestone-start [int] (subtangle first milestone, usually it's the latest snapshot milestone and/or most recent bootstrap+1 milestone) [default mainnet/testnet]
--milestone-keys: (advanced option: defines the depth of the merkle tree used to sign milestones by the coo) [int] [defaults 20/22]
--snapshot-timestamp: [epoch] [defaults epoch-mainnet/epoch-testnet]
Type of change
How Has This Been Tested?
Community testing is required
Checklist: