From ee592c71d6c760ef05ef4f8b5c88b31fcbaf52aa Mon Sep 17 00:00:00 2001
From: Noor <noormohammedb@protonmail.com>
Date: Thu, 13 Feb 2025 17:28:09 +0530
Subject: [PATCH] Refactor proto file structure to move brain and dtpm modules
 under sgx for better organization

---
 build.rs                     |  5 ++++-
 proto/{ => sgx}/brain.proto  |  0
 proto/{ => sgx}/dtpm.proto   |  0
 src/lib.rs                   | 13 +------------
 src/sgx/mod.rs               | 12 ++++++++++++
 src/{ => sgx}/types.rs       |  0
 src/{ => sgx}/types/brain.rs |  4 ++--
 src/{ => sgx}/types/dtpm.rs  |  2 +-
 8 files changed, 20 insertions(+), 16 deletions(-)
 rename proto/{ => sgx}/brain.proto (100%)
 rename proto/{ => sgx}/dtpm.proto (100%)
 create mode 100644 src/sgx/mod.rs
 rename src/{ => sgx}/types.rs (100%)
 rename src/{ => sgx}/types/brain.rs (93%)
 rename src/{ => sgx}/types/dtpm.rs (99%)

diff --git a/build.rs b/build.rs
index fadf69f..a97a026 100644
--- a/build.rs
+++ b/build.rs
@@ -2,7 +2,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::configure()
         .build_server(true)
         .protoc_arg("--experimental_allow_proto3_optional")
-        .compile_protos(&["proto/brain.proto", "proto/dtpm.proto"], &["proto"])?;
+        .compile_protos(
+            &["proto/sgx/brain.proto", "proto/sgx/dtpm.proto"],
+            &["proto"],
+        )?;
 
     Ok(())
 }
diff --git a/proto/brain.proto b/proto/sgx/brain.proto
similarity index 100%
rename from proto/brain.proto
rename to proto/sgx/brain.proto
diff --git a/proto/dtpm.proto b/proto/sgx/dtpm.proto
similarity index 100%
rename from proto/dtpm.proto
rename to proto/sgx/dtpm.proto
diff --git a/src/lib.rs b/src/lib.rs
index 17917c8..a4434b6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,12 +1 @@
-pub mod pb {
-
-    pub mod brain {
-        tonic::include_proto!("brain");
-    }
-
-    pub mod dtpm {
-        tonic::include_proto!("dtpm");
-    }
-}
-
-pub mod types;
+pub mod sgx;
\ No newline at end of file
diff --git a/src/sgx/mod.rs b/src/sgx/mod.rs
new file mode 100644
index 0000000..85ba45d
--- /dev/null
+++ b/src/sgx/mod.rs
@@ -0,0 +1,12 @@
+pub mod types;
+
+pub mod pb {
+
+    pub mod brain {
+        tonic::include_proto!("brain");
+    }
+
+    pub mod dtpm {
+        tonic::include_proto!("dtpm");
+    }
+}
diff --git a/src/types.rs b/src/sgx/types.rs
similarity index 100%
rename from src/types.rs
rename to src/sgx/types.rs
diff --git a/src/types/brain.rs b/src/sgx/types/brain.rs
similarity index 93%
rename from src/types/brain.rs
rename to src/sgx/types/brain.rs
index 7a34f8b..cfdcfa7 100644
--- a/src/types/brain.rs
+++ b/src/sgx/types/brain.rs
@@ -1,5 +1,5 @@
-use crate::pb::brain::{daemon_message_app, AppNodeResources, DaemonMessageApp, NewAppRes};
-use crate::pb::brain::{AppResource, DaemonAuth, MappedPort, NewAppReq};
+use crate::sgx::pb::brain::{daemon_message_app, AppNodeResources, DaemonMessageApp, NewAppRes};
+use crate::sgx::pb::brain::{AppResource, DaemonAuth, MappedPort, NewAppReq};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
diff --git a/src/types/dtpm.rs b/src/sgx/types/dtpm.rs
similarity index 99%
rename from src/types/dtpm.rs
rename to src/sgx/types/dtpm.rs
index 5442de6..04cc562 100644
--- a/src/types/dtpm.rs
+++ b/src/sgx/types/dtpm.rs
@@ -1,4 +1,4 @@
-use crate::pb::dtpm as pb_dtpm;
+use crate::sgx::pb::dtpm as pb_dtpm;
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
 use serde::{Deserialize, Serialize};