Change mtp:op:start-session to op:start-session

goblins/ocapn/captp.rkt

@@ -190,23 +190,13 @@
   marshall::desc:handoff-receive unmarshall::desc:handoff-receive)
 
 ;; machinetp operations/descriptions
-(define-recordable-struct mtp:op:start-session
+(define-recordable-struct op:start-session
   (captp-version
    handoff-pubkey
    ;; a sig-envelope signed by handoff-pubkey with a <my-location $location-data>
    acceptable-location
    acceptable-location-sig)
-  marshall::mtp:op:start-session unmarshall::mtp:op:start-session)
-
-
-;; Confirm we both have the session name, each side signs with its
-;; respective key
-;; Not sure this is necessary...
-#;(define-recordable-struct mtp:op:confirm-session
-  (session-name-sig)
-  marshall::mtp:op:start-session unmarshall::mtp:op:start-session)
-
-;; TODO: 3 vat/machine handoff versions (Promise3Desc, Far3Desc)
+  marshall::op:start-session unmarshall::op:start-session)
 
 (define marshallers
   (list marshall::op:bootstrap
@@ -223,7 +213,7 @@
         marshall::desc:sig-envelope
         marshall::desc:handoff-give
         marshall::desc:handoff-receive
-        marshall::mtp:op:start-session
+        marshall::op:start-session
 
         marshall::ocapn-machine
         marshall::ocapn-sturdyref
@@ -245,7 +235,7 @@
         unmarshall::desc:sig-envelope
         unmarshall::desc:handoff-give
         unmarshall::desc:handoff-receive
-        unmarshall::mtp:op:start-session
+        unmarshall::op:start-session
 
         unmarshall::ocapn-machine
         unmarshall::ocapn-sturdyref
@@ -1421,7 +1411,7 @@
           ;; TODO: Shouldn't the netlayer actually interpret this message
           ;;   before it gets here?  Ie, at this stage, we're already
           ;;   "confident" this is from the right location
-          [(mtp:op:start-session remote-captp-version
+          [(op:start-session remote-captp-version
                                  remote-encoded-pubkey
                                  (? ocapn-machine? claimed-remote-location)
                                  remote-location-sig)
@@ -1520,10 +1510,10 @@
 
       ;; Now we'll need to send our side of the start-session and get the
       ;; other side... which will be handled by the ^setup-completer above
-      (send-to-remote (mtp:op:start-session captp-version
-                                            handoff-pubkey
-                                            our-location
-                                            our-location-sig))
+      (send-to-remote (op:start-session captp-version
+                                        handoff-pubkey
+                                        our-location
+                                        our-location-sig))
       
       ;; Return the meta-bootstrap-vow, which will be completed as above
       meta-bootstrap-vow]