From 38471b7b347105bb14d40f7a877dad6c9b6bf082 Mon Sep 17 00:00:00 2001
From: Tyler Goodlet <jgbt@protonmail.com>
Date: Mon, 22 Mar 2021 09:52:22 -0400
Subject: [PATCH] Use early return instead of branching for remote emsd
 spawning

---
 piker/clearing/_client.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/piker/clearing/_client.py b/piker/clearing/_client.py
index 97412280..6accc0b8 100644
--- a/piker/clearing/_client.py
+++ b/piker/clearing/_client.py
@@ -174,22 +174,21 @@ async def maybe_open_emsd(
     async with tractor.find_actor('emsd') as portal:
         if portal is not None:
             yield portal
+            return
 
-        else:
-            # ask remote daemon tree to spawn it
-            from .._daemon import spawn_emsd
+    # ask remote daemon tree to spawn it
+    from .._daemon import spawn_emsd
 
-            async with tractor.find_actor('pikerd') as portal:
+    async with tractor.find_actor('pikerd') as portal:
+        assert portal
+        name = await portal.run(
+            spawn_emsd,
+            brokername=brokername,
+        )
 
-                if portal is not None:
+        async with tractor.wait_for_actor(name) as portal:
+            yield portal
 
-                    name = await portal.run(
-                        spawn_emsd,
-                        brokername=brokername,
-                    )
-
-                    async with tractor.wait_for_actor(name) as portal:
-                        yield portal
 
 
 @asynccontextmanager