fix: check status and version to find peers #30
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
Codecov Report
@@ Coverage Diff @@
## master #30 +/- ##
==========================================
+ Coverage 99.54% 99.55% +<.01%
==========================================
Files 23 23
Lines 221 224 +3
Branches 19 20 +1
==========================================
+ Hits 220 223 +3
Misses 1 1
Continue to review full report at Codecov.
|
luciorubeens
changed the title
alexbarnsley
requested review from
j-a-m-l
and removed request for
alexbarnsley
j-a-m-l
reviewed
Jan 28, 2019
| @@ -19,6 +20,10 @@ const mergePeerArrays = (oldArray, newArray) => { | |||
| return peers | |||
| } | |||
|
|
|||
| const getPeerVersion = (peer) => { | |||
| return !peer.version || /^1\./.test(peer.version) ? 1 : 2 | |||
There was a problem hiding this comment.
I'd use something like:
return (peer.version && peer.version.startsWith('1.')) ? 1 : 2| @@ -69,7 +71,7 @@ module.exports = class ApiClient { | |||
| if (responsePeers.length) { | |||
| // Ignore local and unavailable peers | |||
There was a problem hiding this comment.
// Ignore local and unavailable peers, and those with wrong version| @@ -69,7 +71,7 @@ module.exports = class ApiClient { | |||
| if (responsePeers.length) { | |||
| // Ignore local and unavailable peers | |||
| responsePeers = responsePeers.filter(peer => { | |||
| return selfIps.indexOf(peer.ip) === -1 && peer.status === versionStatus[version] | |||
| return selfIps.indexOf(peer.ip) === -1 && versionStatus.includes(peer.status) && getPeerVersion(peer) === version | |||
There was a problem hiding this comment.
I'd use includes on both checks:
return !selfIps.includes(peer.ip) && versionStatus.includes(peer.status) && getPeerVersion(peer) === version
j-a-m-l
approved these changes
Jan 28, 2019
There was a problem hiding this comment.
@alexbarnsley Approved in case you want to release it today without my suggestions
|
Can do the refactoring at a later time, thanks 👌 |
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.
This PR includes a way to deal wtih ArkEcosystem/core#2026