Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: discv5 re-org clean-up #1823

Merged
merged 3 commits into from
Jun 28, 2023
Merged

chore: discv5 re-org clean-up #1823

merged 3 commits into from
Jun 28, 2023

Conversation

SionoiS
Copy link
Contributor

@SionoiS SionoiS commented Jun 26, 2023

Description

Clean-up remnants of the discv5 re-org

Changes

  • Remove discv5 from node and it's builder
  • Require a record to init a node (it was previously using discv5 record).
  • Fix various tests that assumed nodes with discv5.

Tracking #1812

@SionoiS SionoiS marked this pull request as ready for review June 27, 2023 14:00
- Fix ENR creation

- Fix wakubridge
Copy link
Collaborator

@Ivansete-status Ivansete-status left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks great! Thanks for it!
I added a few minor comments

udpPort = some(nodeUdpPort),
)
builder.withWakuCapabilities(flags)
#builder.withMultiaddrs(???)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a big deal but I'd delete this comment

Comment on lines 296 to 297
if not discv5BootstrapEnrsRes.isOk():
error("failed discovering peers from DNS")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if not discv5BootstrapEnrsRes.isOk():
error("failed discovering peers from DNS")
if discv5BootstrapEnrsRes.isErr():
error("failed discovering peers from DNS: " & discv5BootstrapEnrsRes.error)

@@ -366,12 +405,12 @@ when isMainModule:
let restClient = clientRest.get()

# start waku node
let nodeRes = initAndStartNode(conf)
let nodeRes = initAndStartApp(conf)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we change this we'd need to change the previous comment and the next error message

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's exactly the kind of errors I wish the tooling would catch... :(

@SionoiS SionoiS merged commit cf46fb7 into master Jun 28, 2023
13 checks passed
@SionoiS SionoiS deleted the chore-discv5-clean branch June 28, 2023 12:57
@SionoiS SionoiS mentioned this pull request Jun 28, 2023
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants