From 52f35c16849d570a65b97236562c51e6ae605728 Mon Sep 17 00:00:00 2001
From: Gregor Reitzenstein <me@dequbed.space>
Date: Sun, 29 Aug 2021 12:18:24 +0200
Subject: [PATCH] Clean up API code for initial stable release

---
 connection.capnp        |  6 +-----
 federationsystem.capnp  | 12 ------------
 interactionsystem.capnp | 12 ------------
 machine.capnp           |  4 +---
 machinesystem.capnp     |  9 +--------
 user.capnp              |  9 +--------
 6 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 federationsystem.capnp
 delete mode 100644 interactionsystem.capnp

diff --git a/connection.capnp b/connection.capnp
index 6640c3c..4e638a9 100644
--- a/connection.capnp
+++ b/connection.capnp
@@ -22,8 +22,4 @@ interface Bootstrap
     userSystem @2 () -> ( userSystem : UserSystem );
 
     permissionSystem @3 () -> ( permissionSystem : PermissionSystem );    
-
-    #interactionSystem @4 () -> ( interactionSystem : InteractionSystem );
-
-    #federationSystem @5 () -> ( federationSystem : FederationSystem );
-}
\ No newline at end of file
+}
diff --git a/federationsystem.capnp b/federationsystem.capnp
deleted file mode 100644
index e587816..0000000
--- a/federationsystem.capnp
+++ /dev/null
@@ -1,12 +0,0 @@
-@0xb3359bdbf762b7ab;
-
-using Rust = import "programming_language/rust.capnp";
-$Rust.parentModule("schema");
-
-using CSharp = import "programming_language/csharp.capnp";
-$CSharp.namespace("FabAccessAPI.Schema");
-
-interface FederationSystem 
-{
-    
-}
\ No newline at end of file
diff --git a/interactionsystem.capnp b/interactionsystem.capnp
deleted file mode 100644
index 140327b..0000000
--- a/interactionsystem.capnp
+++ /dev/null
@@ -1,12 +0,0 @@
-@0xf997d4fafd488ee6;
-
-using Rust = import "programming_language/rust.capnp";
-$Rust.parentModule("schema");
-
-using CSharp = import "programming_language/csharp.capnp";
-$CSharp.namespace("FabAccessAPI.Schema");
-
-interface InteractionSystem 
-{
-    
-}
\ No newline at end of file
diff --git a/machine.capnp b/machine.capnp
index 09657d6..46453a6 100644
--- a/machine.capnp
+++ b/machine.capnp
@@ -58,8 +58,6 @@ struct Machine {
     interface InUse $CSharp.name("InUseInterface") {
         giveBack @0 ();
         sendRawData @1 (data :Data);
-
-        #transfer @2 (user: User);
     }
 
     transfer @9 :Transfer;
@@ -97,4 +95,4 @@ struct Machine {
         setAdminProperty @3 (property :General.KeyValuePair);
         removeAdminProperty @4 (property :General.KeyValuePair);
     }
-}
\ No newline at end of file
+}
diff --git a/machinesystem.capnp b/machinesystem.capnp
index a4a424d..7af2668 100644
--- a/machinesystem.capnp
+++ b/machinesystem.capnp
@@ -17,11 +17,4 @@ interface MachineSystem
 
     	getMachine @1 ( uuid :General.UUID ) -> ( machine :Machine);
 	}
-
-	#manage @1 () -> ( manage : Manage );
-    #interface Manage $CSharp.name("ManageInterface") {
-    #	addMachine @0 (machine :Machine);
-    #	updateMachine @1 (machine :Machine);
-    #	removeMachine @2 (machine :Machine);
-	#}
-}
\ No newline at end of file
+}
diff --git a/user.capnp b/user.capnp
index 908135d..180efee 100644
--- a/user.capnp
+++ b/user.capnp
@@ -19,14 +19,7 @@ struct User
     struct UserInfoExtended
     {
         id @0 :General.UUID;
-        firstname @1 :Text;
-        lastname @2 :Text;
-        #address @3 :Address;
-
-        #struct Address
-        #{ # TODO POST*CODE
-        #    text @0 :Text;
-        #}
+        name @1 :Text;
     }
 
     info @3 :Info;