refactor: proper use of setupNat #1740
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
Notice that I had to adapt to use 'rlpx_connected_peers' instead of 'connected_peers' in 'wakunode1.nim' because due to the update of the 'vendor/nim-eth', which adds the dependency-break with 'confutils' but also includes another changes. Aside note: we cannot have 'confutils' dependency in 'nim-eth' because that will prevent the generation of any waku dynamic library.
Ivansete-status
force-pushed
the
refactor-setupnat
branch
from
aabfc4c
to
b2f5172
Compare
vpavlin
reviewed
May 17, 2023
| Port(uint16(conf.udpPort) + conf.portsShift)) | ||
| if natRes.isErr(): | ||
| error "Error in setupNat", error = natRes.error | ||
|
|
There was a problem hiding this comment.
You are calling quit() in the wakubridge, but not here - should the reaction be consistent accross apps?
There was a problem hiding this comment.
I agree indeed. However, this is consistent within the chat2bridge.nim itself. I think it is better if we raise a separate PR for that.
There was a problem hiding this comment.
@vpavlin - Next week I will create a separate PR for adding consistency in the parameters checks for all the apps.
vpavlin
reviewed
May 17, 2023
tests/v1/test_waku_connect.nim
Outdated
| p1.isNil | ||
| p2.isNil == false | ||
| p3.isNil == false | ||
| p1.isErr() |
There was a problem hiding this comment.
In other cases it is xplicitly checking against true - should we be consistent and do it here as well?
vpavlin
approved these changes
May 17, 2023
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.
Description
This PR is aimed to give a better structure to the
setupNatproc usage, plus update the reference tonim-ethsubmodule.The update of
nim-ethsubmodule is important to break theconfutilsdependency, and therefore, allow the generation of the waku dynamic library, as intended in: #1730Notice that I had to use
rlpx_connected_peersinstead ofconnected_peersinwakunode1.nimdue to the update of thevendor/nim-eth, which not only adds the dependency-break with 'confutils' but also includes another changes.