waku-org
/
nwaku
mirror of https://github.com/waku-org/nwaku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary ENR caching (#700)

This commit is contained in:
Hanno Cornelius 2021-08-17 10:30:17 +02:00 committed by GitHub
parent 36b9176569
commit 4aae5c55ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/v2/test_waku_dnsdisc.nim
View File

@ -65,12 +65,11 @@ procSuite "Waku DNS Discovery":
let let
nodeKey4 = crypto.PrivateKey.random(Secp256k1, rng[])[] nodeKey4 = crypto.PrivateKey.random(Secp256k1, rng[])[]
node4 = WakuNode.new(nodeKey4, bindIp, Port(60004)) node4 = WakuNode.new(nodeKey4, bindIp, Port(60004))
enr4 = node4.enr
node4.mountRelay() node4.mountRelay()
await node4.start() await node4.start()
var wakuDnsDisc = WakuDnsDiscovery.init(enr4, location, resolver).get() var wakuDnsDisc = WakuDnsDiscovery.init(location, resolver).get()
let res = wakuDnsDisc.findPeers() let res = wakuDnsDisc.findPeers()

6
waku/v2/node/dnsdisc/waku_dnsdisc.nim
View File

@ -29,7 +29,6 @@ logScope:
type type
WakuDnsDiscovery* = object WakuDnsDiscovery* = object
enr*: enr.Record
client*: Client client*: Client
resolver*: Resolver resolver*: Resolver
@ -158,16 +157,15 @@ proc findPeers*(wdd: var WakuDnsDiscovery): Result[seq[PeerInfo], cstring] =
return ok(discoveredNodes) return ok(discoveredNodes)
proc init*(T: type WakuDnsDiscovery, proc init*(T: type WakuDnsDiscovery,
enr: enr.Record,
locationUrl: string, locationUrl: string,
resolver: Resolver): Result[T, cstring] = resolver: Resolver): Result[T, cstring] =
## Initialise Waku peer discovery via DNS ## Initialise Waku peer discovery via DNS
debug "init WakuDnsDiscovery", enr=enr, locationUrl=locationUrl debug "init WakuDnsDiscovery", locationUrl=locationUrl
let let
client = ? Client.init(locationUrl) client = ? Client.init(locationUrl)
wakuDnsDisc = WakuDnsDiscovery(enr: enr, client: client, resolver: resolver) wakuDnsDisc = WakuDnsDiscovery(client: client, resolver: resolver)
debug "init success" debug "init success"

3
waku/v2/node/wakunode2.nim
View File

@ -855,8 +855,7 @@ when isMainModule:
# @ TODO: this is merely POC integration with an empty resolver # @ TODO: this is merely POC integration with an empty resolver
debug "Waku DNS Discovery enabled. Using empty resolver." debug "Waku DNS Discovery enabled. Using empty resolver."
var wakuDnsDiscovery = WakuDnsDiscovery.init(node.enr, var wakuDnsDiscovery = WakuDnsDiscovery.init(conf.dnsDiscoveryUrl,
conf.dnsDiscoveryUrl,
emptyResolver) # TODO: Add DNS resolver emptyResolver) # TODO: Add DNS resolver
if wakuDnsDiscovery.isOk: if wakuDnsDiscovery.isOk:
let discoveredPeers = wakuDnsDiscovery.get().findPeers() let discoveredPeers = wakuDnsDiscovery.get().findPeers()