Better live order handling logic

piker/clearing/_ems.py

@@ -556,9 +556,7 @@ async def process_client_order_cmds(
 
             # check for live-broker order
             if live_entry:
-
-                reqid = reqid or live_entry.reqid
-                assert reqid
+                reqid = live_entry.reqid
 
                 msg = BrokerdCancel(
                     oid=oid,
@@ -566,11 +564,13 @@ async def process_client_order_cmds(
                     time_ns=time.time_ns(),
                 )
 
+                # NOTE: cancel response will be relayed back in messages
+                # from corresponding broker
+                if reqid:
+
                     # send cancel to brokerd immediately!
                     log.info("Submitting cancel for live order {reqid}")
 
-                # NOTE: cancel response will be relayed back in messages
-                # from corresponding broker
                     await brokerd_order_stream.send(msg.dict())
 
                 else:
@@ -580,7 +580,8 @@ async def process_client_order_cmds(
                     # order request can be cancelled at that time.
                     dark_book._ems_entries[oid] = msg
 
-                # check for EMS active exec
+            # dark trigger cancel
+            else:
                 try:
                     # remove from dark book clearing
                     dark_book.orders[symbol].pop(oid, None)