From 25effe262629c6f92773d4e6762f404b858fb09a Mon Sep 17 00:00:00 2001
From: Gregor Reitzenstein <me@dequbed.space>
Date: Fri, 23 Oct 2020 11:52:20 +0200
Subject: [PATCH] Adds an Bootstrap interface

---
 api.capnp        |  9 ---------
 connection.capnp | 18 +++++++-----------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/api.capnp b/api.capnp
index 1a0e9a6..e5a75a3 100644
--- a/api.capnp
+++ b/api.capnp
@@ -28,15 +28,6 @@ $Rust.parentModule("schema");
 using CSharp = import "csharp.capnp";
 $CSharp.namespace("FabAccessAPI.Schema");
 
-struct FabAccess {
-    permissions @0 :Permissions;
-    # Permission subsystem to manage permissions and systems underlying the authorization process
-
-    machines @1 :Machines;
-    # Diflouroborane stores machine¹ information in an opaque internal database. This interface is
-    # the only stable process of modifying that information
-}
-
 interface Machines {
     # The interface to the machines subsystem
 
diff --git a/connection.capnp b/connection.capnp
index 6a1adb9..01f3d66 100644
--- a/connection.capnp
+++ b/connection.capnp
@@ -31,19 +31,15 @@ $CSharp.namespace("FabAccessAPI.Schema");
 using Auth = import "auth.capnp";
 using Api = import "api.capnp";
 
-struct Message {
-    union {
-        greet @0 :Greeting;
-        # Be polite and say hello to the other end
+interface Bootstrap {
+    auth @0 () -> ( auth :Auth.Authentication );
 
-        leave @1 :Leave;
+    permissions @1 () -> ( permissions :Api.Permissions );
+    # Permission subsystem to manage permissions and systems underlying the authorization process
 
-        auth @2 :Auth.Authentication;
-        # Start an authenticaion exchange
-
-        # TODO: RPC bootstrapping
-        api @3 :Api.FabAccess;
-    }
+    machines @2 () -> ( machines :Api.Machines );
+    # Diflouroborane stores machine¹ information in an opaque internal database. This interface is
+    # the only stable process of modifying that information
 }
 
 struct Greeting {