From 6b930ae7e69242ef3a62d1d3c4aa085973bf1055 Mon Sep 17 00:00:00 2001
From: Dmitriy Ryajov <dryajov@gmail.com>
Date: Tue, 6 Apr 2021 14:16:23 -0600
Subject: [PATCH] More builders (#560)

* address some issues pointed out in review

* re-add to prevent breaking other projects
---
 libp2p/builders.nim        | 12 ++++++------
 libp2p/standard_switch.nim |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 libp2p/standard_switch.nim

diff --git a/libp2p/builders.nim b/libp2p/builders.nim
index 27e3d86cd..be03b35b8 100644
--- a/libp2p/builders.nim
+++ b/libp2p/builders.nim
@@ -3,8 +3,7 @@ import
   switch, peerid, peerinfo, stream/connection, multiaddress,
   crypto/crypto, transports/[transport, tcptransport],
   muxers/[muxer, mplex/mplex],
-  protocols/[identify, secure/secure, secure/noise],
-  connmanager
+  protocols/[identify, secure/secure, secure/noise]
 
 export
   switch, peerid, peerinfo, connection, multiaddress, crypto
@@ -36,13 +35,12 @@ type
     protoVersion: string
     agentVersion: string
 
-proc init*(T: type[SwitchBuilder]): T =
+proc new*(T: type[SwitchBuilder]): T =
   SwitchBuilder(
     privKey: none(PrivateKey),
     address: MultiAddress.init("/ip4/127.0.0.1/tcp/0").tryGet(),
     secureManagers: @[],
     tcpTransportOpts: TcpTransportOpts(),
-    rng: newRng(),
     maxConnections: MaxConnections,
     maxIn: -1,
     maxOut: -1,
@@ -137,7 +135,6 @@ proc build*(b: SwitchBuilder): Switch =
 
   let
     identify = newIdentify(peerInfo)
-    connManager = ConnManager.init(b.maxConnsPerPeer, b.maxConnections, b.maxIn, b.maxOut)
 
   let
     transports = block:
@@ -149,6 +146,9 @@ proc build*(b: SwitchBuilder): Switch =
   if b.secureManagers.len == 0:
     b.secureManagers &= SecureProtocol.Noise
 
+  if isNil(b.rng):
+    b.rng = newRng()
+
   let switch = newSwitch(
     peerInfo = peerInfo,
     transports = transports,
@@ -179,7 +179,7 @@ proc newStandardSwitch*(privKey = none(PrivateKey),
       quit("Secio is deprecated!") # use of secio is unsafe
 
   var b = SwitchBuilder
-    .init()
+    .new()
     .withAddress(address)
     .withRng(rng)
     .withMaxConnections(maxConnections)
diff --git a/libp2p/standard_switch.nim b/libp2p/standard_switch.nim
new file mode 100644
index 000000000..056439cc9
--- /dev/null
+++ b/libp2p/standard_switch.nim
@@ -0,0 +1,2 @@
+import builders
+export builders