From 6d81f1ee55dcf08863a21ad1fc6ca841a15492df Mon Sep 17 00:00:00 2001 From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com> Date: Thu, 4 Nov 2021 15:46:38 +0100 Subject: [PATCH] Update submodules (#761) --- 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 ++++++++++---------- vendor/nim-chronicles | 2 +- vendor/nim-eth | 2 +- vendor/nim-faststreams | 2 +- vendor/nim-json-serialization | 2 +- vendor/nim-libp2p | 2 +- vendor/nim-stew | 2 +- vendor/nim-stint | 2 +- waku/v2/node/quicksim2.nim | 2 +- waku/v2/node/start_network2.nim | 4 ++-- waku/v2/node/wakunode2.nim | 2 +- 16 files changed, 33 insertions(+), 33 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/vendor/nim-chronicles b/vendor/nim-chronicles index ba2817f1a..9aabb5a02 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit ba2817f1a9f5ddb59274295f3fe9a54fbf1a5a96 +Subproject commit 9aabb5a028defc961fecb263ac9a3c5bba263ea2 diff --git a/vendor/nim-eth b/vendor/nim-eth index d34d3409d..d4cc42241 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit d34d3409da62376031dd4a026075deab659216a8 +Subproject commit d4cc42241df92fc661fb9cdfe08048715db793cd diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams index 3a0ab4257..1b561a9e7 160000 --- a/vendor/nim-faststreams +++ b/vendor/nim-faststreams @@ -1 +1 @@ -Subproject commit 3a0ab42573e566ce52625760f6bbf7e0bbb6ebc4 +Subproject commit 1b561a9e71b6bdad1c1cdff753418906037e9d09 diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index 4f3775ddf..297496d70 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit 4f3775ddf48d9abee30c51a53862cea84a09fa78 +Subproject commit 297496d703a43cbbe00323abe7f0b7f8e320ff33 diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index 3669b90ce..e1d96a0f4 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit 3669b90ceb6d1687e91cf3f87138cb90803f9446 +Subproject commit e1d96a0f4d7620b3ebb16396c26a14306ddd3ddd diff --git a/vendor/nim-stew b/vendor/nim-stew index 478cc6efd..b002c1fad 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit 478cc6efdefaabadf0666a3351fb959b78009bcc +Subproject commit b002c1fad025c6b5fe1f6af1fbb7502dc3173beb diff --git a/vendor/nim-stint b/vendor/nim-stint index 49d11d61b..036c71d06 160000 --- a/vendor/nim-stint +++ b/vendor/nim-stint @@ -1 +1 @@ -Subproject commit 49d11d61b824c1aa6ef16d4092fb3c27b21b0748 +Subproject commit 036c71d06a6b22f8f967ba9d54afd2189c3872ca 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