From 2d9e6a7ac88cd902c6e3e18e9397bc074b1c5ed8 Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Mon, 11 Feb 2019 17:17:24 +1100
Subject: [PATCH] Review comments

---
 js/modules/loki_snode_api.js | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/js/modules/loki_snode_api.js b/js/modules/loki_snode_api.js
index 209c8cd09..a93fb02ca 100644
--- a/js/modules/loki_snode_api.js
+++ b/js/modules/loki_snode_api.js
@@ -79,29 +79,26 @@ class LokiSnodeAPI {
   }
 
   async getSwarmNodesForPubKey(pubKey) {
-    let conversation;
-    let swarmNodes;
     try {
-      conversation = ConversationController.get(pubKey);
-      swarmNodes = [...conversation.get('swarmNodes')];
+      const conversation = ConversationController.get(pubKey);
+      const swarmNodes = [...conversation.get('swarmNodes')];
+      return swarmNodes;
     } catch (e) {
       throw new window.textsecure.ReplayableError({
         message: 'Could not get conversation',
       });
     }
-    return swarmNodes;
   }
 
   async updateSwarmNodes(pubKey, newNodes) {
-    let conversation;
     try {
-      conversation = ConversationController.get(pubKey);
+      const conversation = ConversationController.get(pubKey);
+      await conversation.updateSwarmNodes(newNodes);
     } catch (e) {
       throw new window.textsecure.ReplayableError({
         message: 'Could not get conversation',
       });
     }
-    await conversation.updateSwarmNodes(newNodes);
   }
 
   async getOurSwarmNodes() {
@@ -128,12 +125,7 @@ class LokiSnodeAPI {
 
   async refreshSwarmNodesForPubKey(pubKey) {
     const newNodes = await this.getFreshSwarmNodes(pubKey);
-    try {
-      const conversation = ConversationController.get(pubKey);
-      await conversation.updateSwarmNodes(newNodes);
-    } catch (e) {
-      throw e;
-    }
+    this.updateSwarmNodes(pubKey, newNodes);
   }
 
   async getFreshSwarmNodes(pubKey) {