From 5ee67f31bfe666a9d77fe57542e697696c6e957a Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Mon, 12 Apr 2021 16:47:48 -0600 Subject: [PATCH] Merge master (#562) * builders (#559) * More builders (#560) * address some issues pointed out in review * re-add to prevent breaking other projects * 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 Co-authored-by: Giovanni Petrantoni <7008900+sinkingsugar@users.noreply.github.com> Co-authored-by: Jacek Sieka --- libp2p/builders.nim | 2 -- 1 file changed, 2 deletions(-) diff --git a/libp2p/builders.nim b/libp2p/builders.nim index 203b633..79008b6 100644 --- a/libp2p/builders.nim +++ b/libp2p/builders.nim @@ -40,8 +40,6 @@ type mplexOpts: MplexOpts tcpTransportOpts: TcpTransportOpts rng: ref BrHmacDrbgContext - inTimeout: Duration - outTimeout: Duration maxConnections: int maxIn: int maxOut: int