This repository has been archived by the owner on Sep 26, 2019. It is now read-only.
[PAN-2783] Invert dependency between permissioning and p2p #1557
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
mbaxter
commented
Jun 12, 2019
| @@ -363,13 +359,6 @@ public P2PNetwork build() { | |||
|
|
|||
| private P2PNetwork doBuild() { | |||
| // Set up permissions | |||
| // Fold NodePermissioningController into peerPermissions | |||
| if (nodePermissioningController.isPresent()) { | |||
There was a problem hiding this comment.
This setup has been moved into RunnerBuilder.
| @@ -201,31 +184,6 @@ public void checkMaintainedConnectionPeers_connectingPeer() { | |||
| verify(rlpxAgent, times(0)).connect(peer); | |||
| } | |||
|
|
|||
| @Test | |||
| public void whenBuildingNetworkWithNodePermissioningWithoutBlockchainShouldThrowIllegalState() { | |||
There was a problem hiding this comment.
It is no longer possible to construct the corresponding PeerPermissions object without supplying the nodePermissioning and blockchain objects.
| @@ -269,71 +258,12 @@ public void rejectIncomingConnectionFromBlacklistedPeer() throws Exception { | |||
| } | |||
| } | |||
|
|
|||
| @Test | |||
| public void rejectIncomingConnectionFromNonWhitelistedPeer() throws Exception { | |||
There was a problem hiding this comment.
This case is covered more generically by the test rejectIncomingConnectionFromDisallowedPeer.
|
Closing while tests are being debugged |
lucassaldanha
approved these changes
Jun 14, 2019
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
Invert the dependency between
p2pandpermissioningpackages. This allows us to moveEnodeURL(a p2p-specific datastructure) into thep2ppackage.