use expect more consistently

vacp2p · May 19, 2021 · 1d60df2 · 1d60df2
1 parent cdc0529
commit 1d60df2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 28 deletions.
diff --git a/libp2p/builders.nim b/libp2p/builders.nim
@@ -48,13 +48,13 @@ type
 
 proc new*(T: type[SwitchBuilder]): T =
 
-  let addrRes = MultiAddress.init("/ip4/127.0.0.1/tcp/0")
-  if addrRes.isErr:
-    raise newException(Defect, addrRes.error)
+  let address = MultiAddress
+  .init("/ip4/127.0.0.1/tcp/0")
+  .expect("address should initialize to default")
 
   SwitchBuilder(
     privKey: none(PrivateKey),
-    address: addrRes.get,
+    address: address,
     secureManagers: @[],
     tcpTransportOpts: TcpTransportOpts(),
     maxConnections: MaxConnections,
@@ -128,25 +128,20 @@ proc build*(b: SwitchBuilder): Switch =
     raise newException(Defect, "Cannot initialize RNG")
 
   let pkRes = PrivateKey.random(b.rng[])
-  if pkRes.isErr:
-    raise newException(Defect, "No RNG supplied!")
-
   let
-    seckey = b.privKey.get(otherwise = pkRes.expect("pk was just set"))
+    seckey = b.privKey.get(otherwise = pkRes.expect("Should supply a valid RNG"))
 
   var
     secureManagerInstances: seq[Secure]
   if SecureProtocol.Noise in b.secureManagers:
     secureManagerInstances.add(newNoise(b.rng, seckey).Secure)
 
   let
-    peerInfo = try:
-      var info = PeerInfo.init(seckey, [b.address])
-      info.protoVersion = b.protoVersion
-      info.agentVersion = b.agentVersion
-      info
-    except CatchableError as exc:
-      raiseAssert exc.msg
+    peerInfo = PeerInfo.init(
+      seckey,
+      [b.address],
+      protoVersion = b.protoVersion,
+      agentVersion = b.agentVersion)
 
   let
     muxers = block:

diff --git a/libp2p/protocols/secure/noise.nim b/libp2p/protocols/secure/noise.nim
@@ -601,19 +601,15 @@ proc newNoise*(
     outgoing: bool = true;
     commonPrologue: seq[byte] = @[]): Noise =
 
-  let pkRes = privateKey.getKey()
-  if pkRes.isErr:
-    raise newException(Defect, "Error in private key: " & $pkRes.error)
-
-  let pkByteRes = pkRes.get().getBytes()
-  if pkByteRes.isErr:
-    raise newException(Defect, "Error getting PK bytes " & $pkByteRes.error)
-
+  let pkBytes = privateKey.getKey()
+  .expect("Expected valid private key")
+  .getBytes()
+  .expect("Couldn't get key bytes")
   var noise = Noise(
     rng: rng,
     outgoing: outgoing,
     localPrivateKey: privateKey,
-    localPublicKey: pkByteRes.get(),
+    localPublicKey: pkBytes,
     noiseKeys: genKeyPair(rng[]),
     commonPrologue: commonPrologue,
   )

diff --git a/libp2p/protocols/secure/secio.nim b/libp2p/protocols/secure/secio.nim
@@ -268,10 +268,7 @@ proc newSecioConn(conn: Connection,
     if conn.peerInfo != nil:
       conn.peerInfo
     else:
-      try:
-        PeerInfo.init(remotePubKey)
-      except CatchableError as exc:
-        raise newException(SecioError, exc.msg)
+      PeerInfo.init(remotePubKey)
 
   result = SecioConn.init(conn, conn.peerInfo, conn.observedAddr)