Make add/remove-macrovertex messages async (#82)

Author: karalekas

src/operations/contract.lisp

@@ -269,15 +269,15 @@ If we have a non-null peduncle edge (F -> C above), then we need to tell its sou
         (sync-rpc (make-message-values :values '(dryad))
             ((dryad-address) rootmost-cycle-node)
           (setf (supervisor-node-dryad supervisor) dryad-address)
+          (send-message dryad-address
+                        (make-message-add-macrovertex :address fresh-blossom))
           (sync-rpc (make-message-set-up-blossom
                      :peduncle-edge peduncle-edge
                      :petals path
                      :petal-children petal-child-edges
                      :dryad dryad-address)
               (set-up-result fresh-blossom)
-            (sync-rpc (make-message-add-macrovertex :address fresh-blossom)
-                (result dryad-address)
-              (values))))))))
+            (values)))))))
 
 ;;;
 ;;; message definitions

src/operations/expand.lisp

@@ -385,12 +385,12 @@ In the right diagram, b0 is both the `root-node' and the `matched-node', because
 
 (define-process-upkeep ((node blossom-node)) (EXTINGUISH-BLOSSOM reply-channel)
   "Tell this blossom process to die."
-  (sync-rpc (make-message-remove-macrovertex :address (process-public-address node))
-      (result (blossom-node-dryad node))
-    ;; NOTE: There's no data frame to pop.
-    (when reply-channel
-      (send-message reply-channel (make-message-rpc-done)))
-    (log-entry :entry-type ':blossom-extinguished
-               :log-level 2
-               :blossom node)
-    (setf (blossom-node-wilting node) t)))
+  (send-message (blossom-node-dryad node)
+                (make-message-remove-macrovertex :address (process-public-address node)))
+  ;; NOTE: There's no data frame to pop.
+  (when reply-channel
+    (send-message reply-channel (make-message-rpc-done)))
+  (log-entry :entry-type ':blossom-extinguished
+             :log-level 2
+             :blossom node)
+  (setf (blossom-node-wilting node) t))

tests/operations/expand.lisp

@@ -399,5 +399,4 @@
                                      (vv-edge F D))
                        :match-edge (bb-edge BLOSSOM2 D B B)
                        :positive? t))
-          (is (tree-equalp original-tree target-tree))
-          (is (= 1 (hash-table-count (dryad-macrovertices dryad)))))))))
+          (is (tree-equalp original-tree target-tree)))))))