status-im
/
nim-libp2p
mirror of https://github.com/status-im/nim-libp2p.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove asynccheck (#590) 

* Merge master (#555)

* Revisit Floodsub (#543)

Fixes #525

add coverage to unsubscribeAll and testing

* add mounted protos to identify message (#546)

* add stable/unstable auto bumps

* fix auto-bump CI

* merge nbc auto bump with CI in order to bump only on CI success

* put conditional locks on nbc bump (#549)

* Fix minor exception issues (#550)

Makes code compatible with
https://github.com/status-im/nim-chronos/pull/166 without requiring it.

* fix nimbus ref for auto-bump stable's PR

* Split dialer (#542)

* extracting dialing logic to dialer

* exposing upgrade methods on transport

* cleanup

* fixing tests to use new interfaces

* add comments

* add base exception class and fix hierarchy

* fix imports

* `doAssert` is `ValueError` not `AssertionError`?

* revert back to `AssertionError`

Co-authored-by: Giovanni Petrantoni <7008900+sinkingsugar@users.noreply.github.com>
Co-authored-by: Jacek Sieka <jacek@status.im>

* Merge master (#555)

* Revisit Floodsub (#543)

Fixes #525

add coverage to unsubscribeAll and testing

* add mounted protos to identify message (#546)

* add stable/unstable auto bumps

* fix auto-bump CI

* merge nbc auto bump with CI in order to bump only on CI success

* put conditional locks on nbc bump (#549)

* Fix minor exception issues (#550)

Makes code compatible with
https://github.com/status-im/nim-chronos/pull/166 without requiring it.

* fix nimbus ref for auto-bump stable's PR

* Split dialer (#542)

* extracting dialing logic to dialer

* exposing upgrade methods on transport

* cleanup

* fixing tests to use new interfaces

* add comments

* add base exception class and fix hierarchy

* fix imports

* `doAssert` is `ValueError` not `AssertionError`?

* revert back to `AssertionError`

Co-authored-by: Giovanni Petrantoni <7008900+sinkingsugar@users.noreply.github.com>
Co-authored-by: Jacek Sieka <jacek@status.im>

* cleanup

Co-authored-by: Giovanni Petrantoni <7008900+sinkingsugar@users.noreply.github.com>
Co-authored-by: Jacek Sieka <jacek@status.im>
This commit is contained in:
Dmitriy Ryajov 2021-06-14 17:21:44 -06:00 committed by GitHub
parent bed00ec43c
commit b63e064b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/tutorial/directchat/second.nim
View File

@ -117,8 +117,8 @@ proc writeAndPrint(p: ChatProto) {.async.} =
echo getCurrentExceptionMsg() echo getCurrentExceptionMsg()
proc readWriteLoop(p: ChatProto) {.async.} = proc readWriteLoop(p: ChatProto) {.async.} =
asyncCheck p.writeAndPrint() # execute the async function but does not block asyncSpawn p.writeAndPrint() # execute the async function but does not block
asyncCheck p.readAndPrint() asyncSpawn p.readAndPrint()
proc processInput(rfd: AsyncFD) {.async.} = proc processInput(rfd: AsyncFD) {.async.} =
let transp = fromPipe(rfd) let transp = fromPipe(rfd)

4
docs/tutorial/second.nim
View File

@ -117,8 +117,8 @@ proc writeAndPrint(p: ChatProto) {.async.} =
echo getCurrentExceptionMsg() echo getCurrentExceptionMsg()
proc readWriteLoop(p: ChatProto) {.async.} = proc readWriteLoop(p: ChatProto) {.async.} =
asyncCheck p.writeAndPrint() # execute the async function but does not block asyncSpawn p.writeAndPrint() # execute the async function but does not block
asyncCheck p.readAndPrint() asyncSpawn p.readAndPrint()
proc processInput(rfd: AsyncFD) {.async.} = proc processInput(rfd: AsyncFD) {.async.} =
let transp = fromPipe(rfd) let transp = fromPipe(rfd)

4
examples/directchat.nim
View File

@ -120,8 +120,8 @@ proc writeAndPrint(p: ChatProto) {.async.} =
echo getCurrentExceptionMsg() echo getCurrentExceptionMsg()
proc readWriteLoop(p: ChatProto) {.async.} = proc readWriteLoop(p: ChatProto) {.async.} =
asyncCheck p.writeAndPrint() # execute the async function but does not block asyncSpawn p.writeAndPrint() # execute the async function but does not block
asyncCheck p.readAndPrint() asyncSpawn p.readAndPrint()
proc newChatProto(switch: Switch, transp: StreamTransport): ChatProto = proc newChatProto(switch: Switch, transp: StreamTransport): ChatProto =
var chatproto = ChatProto(switch: switch, transp: transp, codecs: @[ChatCodec]) var chatproto = ChatProto(switch: switch, transp: transp, codecs: @[ChatCodec])

2
examples/go-daemon/bootstrap.nim
View File

@ -35,7 +35,7 @@ proc main() {.async.} =
if item.protoCode() == mcip4 or item.protoCode() == mcip6: if item.protoCode() == mcip4 or item.protoCode() == mcip6:
echo $item & "/ipfs/" & id.peer.pretty() echo $item & "/ipfs/" & id.peer.pretty()
asyncCheck monitor(api) asyncSpawn monitor(api)
proc pubsubLogger(api: DaemonAPI, proc pubsubLogger(api: DaemonAPI,
ticket: PubsubTicket, ticket: PubsubTicket,

4
examples/go-daemon/chat.nim
View File

@ -19,7 +19,7 @@ proc threadMain(wfd: AsyncFD) {.thread.} =
## This procedure performs reading from `stdin` and sends data over ## This procedure performs reading from `stdin` and sends data over
## pipe to main thread. ## pipe to main thread.
var transp = fromPipe(wfd) var transp = fromPipe(wfd)
while true: while true:
var line = stdin.readLine() var line = stdin.readLine()
let res = waitFor transp.write(line & "\r\n") let res = waitFor transp.write(line & "\r\n")
@ -55,7 +55,7 @@ proc serveThread(udata: CustomData) {.async.} =
var stream = await udata.api.openStream(peerId, ServerProtocols) var stream = await udata.api.openStream(peerId, ServerProtocols)
udata.remotes.add(stream.transp) udata.remotes.add(stream.transp)
echo "= Connected to peer chat ", parts[1] echo "= Connected to peer chat ", parts[1]
asyncCheck remoteReader(stream.transp) asyncSpawn remoteReader(stream.transp)
elif line.startsWith("/search"): elif line.startsWith("/search"):
var parts = line.split(" ") var parts = line.split(" ")
if len(parts) == 2: if len(parts) == 2:

2
tests/testidentify.nim
View File

@ -101,7 +101,7 @@ suite "Identify":
asyncTest "handle failed identify": asyncTest "handle failed identify":
msListen.addHandler(IdentifyCodec, identifyProto1) msListen.addHandler(IdentifyCodec, identifyProto1)
asyncCheck transport1.start(ma) asyncSpawn transport1.start(ma)
proc acceptHandler() {.async.} = proc acceptHandler() {.async.} =
var conn: Connection var conn: Connection

6
tests/testmultistream.nim
View File

@ -249,7 +249,7 @@ suite "Multistream select":
msListen.addHandler("/test/proto/1.0.0", protocol) msListen.addHandler("/test/proto/1.0.0", protocol)
let transport1 = TcpTransport.init(upgrade = Upgrade()) let transport1 = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(ma) asyncSpawn transport1.start(ma)
proc acceptHandler(): Future[void] {.async, gcsafe.} = proc acceptHandler(): Future[void] {.async, gcsafe.} =
let conn = await transport1.accept() let conn = await transport1.accept()
@ -341,7 +341,7 @@ suite "Multistream select":
msListen.addHandler("/test/proto/1.0.0", protocol) msListen.addHandler("/test/proto/1.0.0", protocol)
let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(ma) asyncSpawn transport1.start(ma)
proc acceptHandler(): Future[void] {.async, gcsafe.} = proc acceptHandler(): Future[void] {.async, gcsafe.} =
let conn = await transport1.accept() let conn = await transport1.accept()
@ -379,7 +379,7 @@ suite "Multistream select":
msListen.addHandler("/test/proto2/1.0.0", protocol) msListen.addHandler("/test/proto2/1.0.0", protocol)
let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(ma) asyncSpawn transport1.start(ma)
proc acceptHandler(): Future[void] {.async, gcsafe.} = proc acceptHandler(): Future[void] {.async, gcsafe.} =
let conn = await transport1.accept() let conn = await transport1.accept()

6
tests/testnoise.nim
View File

@ -91,7 +91,7 @@ suite "Noise":
serverNoise = Noise.new(rng, serverInfo.privateKey, outgoing = false) serverNoise = Noise.new(rng, serverInfo.privateKey, outgoing = false)
let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(server) asyncSpawn transport1.start(server)
proc acceptHandler() {.async.} = proc acceptHandler() {.async.} =
let conn = await transport1.accept() let conn = await transport1.accept()
@ -130,7 +130,7 @@ suite "Noise":
let let
transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(server) asyncSpawn transport1.start(server)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
var conn: Connection var conn: Connection
@ -165,7 +165,7 @@ suite "Noise":
readTask = newFuture[void]() readTask = newFuture[void]()
let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(server) asyncSpawn transport1.start(server)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
let conn = await transport1.accept() let conn = await transport1.accept()

2
tests/testping.nim
View File

@ -78,7 +78,7 @@ suite "Ping":
let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade())
let transportdialer: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transportdialer: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport.start(baseMa) asyncSpawn transport.start(baseMa)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
let handler = Ping.new().handler let handler = Ping.new().handler

18
tests/testtransport.nim
View File

@ -19,7 +19,7 @@ suite "TCP transport":
asyncTest "test listener: handle write": asyncTest "test listener: handle write":
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet() let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet()
let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport.start(ma) asyncSpawn transport.start(ma)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
let conn = await transport.accept() let conn = await transport.accept()
@ -32,7 +32,7 @@ suite "TCP transport":
let msg = await streamTransport.read(6) let msg = await streamTransport.read(6)
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await streamTransport.closeWait() await streamTransport.closeWait()
await transport.stop() await transport.stop()
check string.fromBytes(msg) == "Hello!" check string.fromBytes(msg) == "Hello!"
@ -41,7 +41,7 @@ suite "TCP transport":
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet() let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet()
let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport.start(ma) asyncSpawn transport.start(ma)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
var msg = newSeq[byte](6) var msg = newSeq[byte](6)
@ -54,7 +54,7 @@ suite "TCP transport":
let streamTransport: StreamTransport = await connect(transport.ma) let streamTransport: StreamTransport = await connect(transport.ma)
let sent = await streamTransport.write("Hello!") let sent = await streamTransport.write("Hello!")
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await streamTransport.closeWait() await streamTransport.closeWait()
await transport.stop() await transport.stop()
@ -84,7 +84,7 @@ suite "TCP transport":
await conn.readExactly(addr msg[0], 6) await conn.readExactly(addr msg[0], 6)
check string.fromBytes(msg) == "Hello!" check string.fromBytes(msg) == "Hello!"
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await conn.close() await conn.close()
await transport.stop() await transport.stop()
@ -116,7 +116,7 @@ suite "TCP transport":
let conn = await transport.dial(ma) let conn = await transport.dial(ma)
await conn.write("Hello!") await conn.write("Hello!")
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await conn.close() await conn.close()
await transport.stop() await transport.stop()
@ -143,7 +143,7 @@ suite "TCP transport":
var msg = newSeq[byte](6) var msg = newSeq[byte](6)
await conn.readExactly(addr msg[0], 6) await conn.readExactly(addr msg[0], 6)
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await conn.close() await conn.close()
await transport2.stop() await transport2.stop()
@ -154,7 +154,7 @@ suite "TCP transport":
asyncTest "e2e: handle read": asyncTest "e2e: handle read":
let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet() let ma: MultiAddress = Multiaddress.init("/ip4/0.0.0.0/tcp/0").tryGet()
let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade()) let transport1: TcpTransport = TcpTransport.init(upgrade = Upgrade())
asyncCheck transport1.start(ma) asyncSpawn transport1.start(ma)
proc acceptHandler() {.async, gcsafe.} = proc acceptHandler() {.async, gcsafe.} =
let conn = await transport1.accept() let conn = await transport1.accept()
@ -169,7 +169,7 @@ suite "TCP transport":
let conn = await transport2.dial(transport1.ma) let conn = await transport2.dial(transport1.ma)
await conn.write("Hello!") await conn.write("Hello!")
await handlerWait.wait(5000.millis) # when no issues will not wait that long! await handlerWait.wait(1.seconds) # when no issues will not wait that long!
await conn.close() await conn.close()
await transport2.stop() await transport2.stop()