This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
[PAN-2560] Normalize EnodeURLs #1264
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
Only specify discovery port explicitly when the discovery port differs from the listening port.
mbaxter
commented
Apr 11, 2019
| @@ -71,10 +73,15 @@ public EnodeURL( | |||
| } | |||
| this.ip = address; | |||
| this.listeningPort = listeningPort; | |||
| this.discoveryPort = discoveryPort; | |||
| // Only explicitly define a discovery port if it differs from the listening port | |||
| if (discoveryPort.isPresent() && discoveryPort.getAsInt() != listeningPort) { | |||
There was a problem hiding this comment.
This is where normalization happens.
AbdelStark
approved these changes
Apr 12, 2019
usmananwar
added a commit
to usmananwar/pantheon
that referenced
this pull request
Apr 15, 2019
* Normalize EnodeURLs (PegaSysEng#1264) Only specify discovery port explicitly when the discovery port differs from the listening port. * Expose sync mode option (PegaSysEng#1270) * Expose sync mode option - remove `hidden` annotation attribute - enable `syncModeOptionMustBeUsed` test fix PAN-2525 fixes PAN-2525 * Update PantheonCommandTest.java * expose fast sync min peers * Feature/move subclass in pantheon command (PegaSysEng#1272) * clean PantheonCommand class - organize imports - move `RpcApisConverter` and `RpcApisConversionException` to separate files * spotlessApply * register converters * Revert "register converters" This reverts commit aec4735. * [PRIV-46] Use labelled timer to differentiate between rocks db metrics (PegaSysEng#1254) * Use labelled timer to differentiate between metrics of public and private db * Update the label names * Keep enode nodeId stored as a BytesValue (PegaSysEng#1274) * Refactor RocksDBStats (PegaSysEng#1266) Move RocksDBStats to it's own module. This also brings metrics to metrics:core since none of our other module have nested modules but they have peer modules. * Create EnodeURL Builder (PegaSysEng#1275)
Closed
notlesh
pushed a commit
to notlesh/pantheon
that referenced
this pull request
Apr 24, 2019
Only specify discovery port explicitly when the discovery port differs from the listening port.
notlesh
pushed a commit
to notlesh/pantheon
that referenced
this pull request
May 4, 2019
Only specify discovery port explicitly when the discovery port differs from the listening port.
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
Normalize
EnodeURL's so that values representing the same enode will have equivalentEnodeURLrepresentations. The spec specifies that thediscportquery param should only be present when the discovery port differs from the listening port. This PR centralizesEnodeURLconstruction so that this condition can be enforced.