Rephrasing

Author: SionoiS

apps/wakunode2/app.nim

@@ -631,12 +631,12 @@ proc startApp*(app: var App): AppResult[void] =
   app.updateApp().isOkOr:
     return err("Error in updateApp: " & $error)
 
-  if (let wakuDiscv5 =  app.wakuDiscv5.get(); app.wakuDiscv5.isSome()):
-    let wakudiscv5Res = catch: (waitFor wakuDiscv5.start())
-    if wakudiscv5Res.isErr():
-      return err("failed to start waku discovery v5: " & wakudiscv5Res.error.msg)
+  if (let wakuDiscv5 = app.wakuDiscv5.get(); app.wakuDiscv5.isSome()):
+    let catchRes = catch: (waitFor wakuDiscv5.start())
+    let startRes = catchRes.valueOr:
+      return err("failed to start waku discovery v5: " & catchRes.error.msg)
 
-    wakudiscv5Res.get().isOkOr:
+    startRes.isOkOr:
       return err("failed to start waku discovery v5: " & error)
 
   return ok()

waku/node/waku_node.nim

@@ -186,16 +186,16 @@ proc connectToNodes*(node: WakuNode, nodes: seq[RemotePeerInfo] | seq[string], s
 
 proc mountMetadata*(node: WakuNode, clusterId: uint32): Result[void, string] =
   if not node.wakuMetadata.isNil():
-    return err("already mounted, skipping")
+    return err("Waku metadata already mounted, skipping")
 
   let metadata = WakuMetadata.new(clusterId, node.enr, node.topicSubscriptionQueue)
 
   node.wakuMetadata = metadata
   node.peerManager.wakuMetadata = metadata
 
-  let mountRes = catch: node.switch.mount(node.wakuMetadata, protocolMatcher(WakuMetadataCodec))
-  if mountRes.isErr():
-    return err(mountRes.error.msg)
+  let catchRes = catch: node.switch.mount(node.wakuMetadata, protocolMatcher(WakuMetadataCodec))
+  if catchRes.isErr():
+    return err(catchRes.error.msg)
 
   return ok()