From 37d6f641226b51e53a03235f37eb95ae7c14195f Mon Sep 17 00:00:00 2001 From: jm-clius Date: Thu, 4 Nov 2021 15:08:02 +0000 Subject: [PATCH] deploy: d3481e613a8c24c0b4a0feb7b418f64ea6992f89 --- tests/v2/test_jsonrpc_waku.nim | 8 ++++---- tests/v2/test_peer_manager.nim | 6 +++--- tests/v2/test_peer_storage.nim | 4 ++-- tests/v2/test_waku_filter.nim | 4 ++-- tests/v2/test_waku_lightpush.nim | 2 +- tests/v2/test_waku_store.nim | 20 ++++++++++---------- waku/v2/node/quicksim2.nim | 2 +- waku/v2/node/start_network2.nim | 4 ++-- waku/v2/node/wakunode2.nim | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/v2/test_jsonrpc_waku.nim b/tests/v2/test_jsonrpc_waku.nim index 2e2dce015..03bb2abf0 100644 --- a/tests/v2/test_jsonrpc_waku.nim +++ b/tests/v2/test_jsonrpc_waku.nim @@ -223,7 +223,7 @@ procSuite "Waku v2 JSON-RPC API": # WakuStore setup let key = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) node.mountStore(persistMessages = true) @@ -523,13 +523,13 @@ procSuite "Waku v2 JSON-RPC API": locationAddr = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet() filterKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - filterPeer = PeerInfo.init(filterKey, @[locationAddr]) + filterPeer = PeerInfo.new(filterKey, @[locationAddr]) swapKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - swapPeer = PeerInfo.init(swapKey, @[locationAddr]) + swapPeer = PeerInfo.new(swapKey, @[locationAddr]) storeKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - storePeer = PeerInfo.init(storeKey, @[locationAddr]) + storePeer = PeerInfo.new(storeKey, @[locationAddr]) node.wakuFilter.setPeer(filterPeer.toRemotePeerInfo()) node.wakuSwap.setPeer(swapPeer.toRemotePeerInfo()) diff --git a/tests/v2/test_peer_manager.nim b/tests/v2/test_peer_manager.nim index 771178234..7cbf95b56 100644 --- a/tests/v2/test_peer_manager.nim +++ b/tests/v2/test_peer_manager.nim @@ -84,15 +84,15 @@ procSuite "Peer Manager": # Create filter peer filterLoc = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet() filterKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - filterPeer = PeerInfo.init(filterKey, @[filterLoc]) + filterPeer = PeerInfo.new(filterKey, @[filterLoc]) # Create swap peer swapLoc = MultiAddress.init("/ip4/127.0.0.2/tcp/2").tryGet() swapKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - swapPeer = PeerInfo.init(swapKey, @[swapLoc]) + swapPeer = PeerInfo.new(swapKey, @[swapLoc]) # Create store peer storeLoc = MultiAddress.init("/ip4/127.0.0.3/tcp/4").tryGet() storeKey = wakunode2.PrivateKey.random(ECDSA, rng[]).get() - storePeer = PeerInfo.init(storeKey, @[storeLoc]) + storePeer = PeerInfo.new(storeKey, @[storeLoc]) await node.start() diff --git a/tests/v2/test_peer_storage.nim b/tests/v2/test_peer_storage.nim index 782a0cd9a..65fac6e34 100644 --- a/tests/v2/test_peer_storage.nim +++ b/tests/v2/test_peer_storage.nim @@ -17,9 +17,9 @@ suite "Peer Storage": # Test Peer peerLoc = MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet() peerKey = crypto.PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(peerKey, @[peerLoc]) + peer = PeerInfo.new(peerKey, @[peerLoc]) peerProto = "/waku/2/default-waku/codec" - stored = StoredInfo(peerId: peer.peerId, addrs: toHashSet([peerLoc]), protos: toHashSet([peerProto]), publicKey: peerKey.getKey().tryGet()) + stored = StoredInfo(peerId: peer.peerId, addrs: toHashSet([peerLoc]), protos: toHashSet([peerProto]), publicKey: peerKey.getPublicKey().tryGet()) conn = Connectedness.CanConnect disconn = 999999 diff --git a/tests/v2/test_waku_filter.nim b/tests/v2/test_waku_filter.nim index 04e22a067..e8968450d 100644 --- a/tests/v2/test_waku_filter.nim +++ b/tests/v2/test_waku_filter.nim @@ -19,7 +19,7 @@ procSuite "Waku Filter": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) contentTopic = ContentTopic("/waku/2/default-content/proto") post = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: contentTopic) @@ -64,7 +64,7 @@ procSuite "Waku Filter": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) contentTopic = ContentTopic("/waku/2/default-content/proto") post = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: contentTopic) diff --git a/tests/v2/test_waku_lightpush.nim b/tests/v2/test_waku_lightpush.nim index 48c90a981..12dc43fc1 100644 --- a/tests/v2/test_waku_lightpush.nim +++ b/tests/v2/test_waku_lightpush.nim @@ -20,7 +20,7 @@ procSuite "Waku Light Push": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) contentTopic = ContentTopic("/waku/2/default-content/proto") post = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: contentTopic) diff --git a/tests/v2/test_waku_store.nim b/tests/v2/test_waku_store.nim index 6cee37949..d5c56aeff 100644 --- a/tests/v2/test_waku_store.nim +++ b/tests/v2/test_waku_store.nim @@ -20,7 +20,7 @@ procSuite "Waku Store": asyncTest "handle query": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) topic = defaultContentTopic msg = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: topic) msg2 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: ContentTopic("2")) @@ -57,7 +57,7 @@ procSuite "Waku Store": asyncTest "handle query with multiple content filters": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) topic1 = defaultContentTopic topic2 = ContentTopic("2") topic3 = ContentTopic("3") @@ -100,7 +100,7 @@ procSuite "Waku Store": asyncTest "handle query with pubsub topic filter": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) contentTopic1 = defaultContentTopic contentTopic2 = ContentTopic("2") contentTopic3 = ContentTopic("3") @@ -147,7 +147,7 @@ procSuite "Waku Store": asyncTest "handle query with pubsub topic filter with no match": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) msg1 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) msg2 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) msg3 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) @@ -188,7 +188,7 @@ procSuite "Waku Store": asyncTest "handle query with pubsub topic filter matching the entire stored messages": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) msg1 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) msg2 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) msg3 = WakuMessage(payload: @[byte 1, 2, 3], contentTopic: defaultContentTopic) @@ -232,7 +232,7 @@ procSuite "Waku Store": asyncTest "handle query with store and restarts": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) topic = defaultContentTopic database = SqliteDatabase.init("", inMemory = true)[] store = WakuMessageStore.init(database)[] @@ -296,7 +296,7 @@ procSuite "Waku Store": asyncTest "handle query with forward pagination": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) var msgList = @[WakuMessage(payload: @[byte 0], contentTopic: ContentTopic("2")), WakuMessage(payload: @[byte 1],contentTopic: defaultContentTopic), @@ -345,7 +345,7 @@ procSuite "Waku Store": asyncTest "handle query with backward pagination": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) var msgList = @[WakuMessage(payload: @[byte 0], contentTopic: ContentTopic("2")), WakuMessage(payload: @[byte 1],contentTopic: defaultContentTopic), @@ -392,7 +392,7 @@ procSuite "Waku Store": asyncTest "handle queries with no pagination": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) var msgList = @[WakuMessage(payload: @[byte 0], contentTopic: ContentTopic("2")), WakuMessage(payload: @[byte 1], contentTopic: defaultContentTopic), @@ -529,7 +529,7 @@ procSuite "Waku Store": asyncTest "temporal history queries": let key = PrivateKey.random(ECDSA, rng[]).get() - peer = PeerInfo.init(key) + peer = PeerInfo.new(key) var msgList = @[WakuMessage(payload: @[byte 0], contentTopic: ContentTopic("2"), timestamp: float(0)), WakuMessage(payload: @[byte 1],contentTopic: ContentTopic("1"), timestamp: float(1)), diff --git a/waku/v2/node/quicksim2.nim b/waku/v2/node/quicksim2.nim index 736461c9a..8a84c55d4 100644 --- a/waku/v2/node/quicksim2.nim +++ b/waku/v2/node/quicksim2.nim @@ -33,7 +33,7 @@ proc message(i: int): ProtoBuffer = let value = "hello " & $(i) var result = initProtoBuffer() - result.write(initProtoField(1, value)) + result.write(1, value) result.finish() proc handler(topic: string, data: seq[byte]) {.async, gcsafe.} = diff --git a/waku/v2/node/start_network2.nim b/waku/v2/node/start_network2.nim index 79ed9a69c..a514537ba 100644 --- a/waku/v2/node/start_network2.nim +++ b/waku/v2/node/start_network2.nim @@ -46,9 +46,9 @@ proc initNodeCmd(shift: int, staticNodes: seq[string] = @[], master = false, lab rkey = SkPrivateKey.init(fromHex(hkey))[] #assumes ok privKey = PrivateKey(scheme: Secp256k1, skkey: rkey) #privKey = PrivateKey.random(Secp256k1) - pubkey = privKey.getKey()[] #assumes ok + pubkey = privKey.getPublicKey()[] #assumes ok keys = KeyPair(seckey: privKey, pubkey: pubkey) - peerInfo = PeerInfo.init(privKey) + peerInfo = PeerInfo.new(privKey) port = 60000 + shift #DefaultAddr = "/ip4/127.0.0.1/tcp/55505" address = "/ip4/127.0.0.1/tcp/" & $port diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim index 054d45ebb..503852330 100644 --- a/waku/v2/node/wakunode2.nim +++ b/waku/v2/node/wakunode2.nim @@ -151,7 +151,7 @@ proc new*(T: type WakuNode, nodeKey: crypto.PrivateKey, elif wsEnabled == false: @[tcpEndPoint(extIp.get(), extPort.get())] else : @[tcpEndPoint(extIp.get(), extPort.get()), tcpEndPoint(extIp.get(), wsBindPort) & addWsFlag] - peerInfo = PeerInfo.init(nodekey) + peerInfo = PeerInfo.new(nodekey) enrIp = if extIp.isSome(): extIp else: some(bindIp) enrTcpPort = if extPort.isSome(): extPort