You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2020/04/10 00:24:52 UTC
[incubator-teaclave] 01/02: [utils] Move to the services directory
since it contains utilities only for services
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit c25e3ac95ccb93ea2d1d72bc2920dc9c22d2ed52
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Thu Apr 9 15:18:20 2020 -0700
[utils] Move to the services directory since it contains utilities only for services
---
services/access_control/enclave/Cargo.toml | 2 +-
services/authentication/enclave/Cargo.toml | 2 +-
services/execution/enclave/Cargo.toml | 2 +-
services/frontend/enclave/Cargo.toml | 2 +-
services/management/enclave/Cargo.toml | 2 +-
services/scheduler/enclave/Cargo.toml | 2 +-
services/storage/enclave/Cargo.toml | 2 +-
{utils => services/utils}/service_app_utils/Cargo.toml | 2 +-
{utils => services/utils}/service_app_utils/src/lib.rs | 0
{utils => services/utils}/service_enclave_utils/Cargo.toml | 6 +++---
.../utils}/service_enclave_utils/proc_macro/Cargo.toml | 0
.../utils}/service_enclave_utils/proc_macro/src/lib.rs | 0
{utils => services/utils}/service_enclave_utils/src/lib.rs | 0
{utils => services/utils}/service_enclave_utils/src/macros.rs | 0
tests/functional/enclave/Cargo.toml | 2 +-
tests/integration/enclave/Cargo.toml | 2 +-
tests/unit/enclave/Cargo.toml | 2 +-
17 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/services/access_control/enclave/Cargo.toml b/services/access_control/enclave/Cargo.toml
index 3113111..2e19f5a 100644
--- a/services/access_control/enclave/Cargo.toml
+++ b/services/access_control/enclave/Cargo.toml
@@ -41,7 +41,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils" }
diff --git a/services/authentication/enclave/Cargo.toml b/services/authentication/enclave/Cargo.toml
index 321e8ad..33c77f6 100644
--- a/services/authentication/enclave/Cargo.toml
+++ b/services/authentication/enclave/Cargo.toml
@@ -44,7 +44,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_rpc = { path = "../../../rpc" }
teaclave_binder = { path = "../../../binder" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils", optional = true }
diff --git a/services/execution/enclave/Cargo.toml b/services/execution/enclave/Cargo.toml
index b950c91..029dad6 100644
--- a/services/execution/enclave/Cargo.toml
+++ b/services/execution/enclave/Cargo.toml
@@ -42,7 +42,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_worker = { path = "../../../worker" }
teaclave_test_utils = { path = "../../../tests/utils", optional = true }
diff --git a/services/frontend/enclave/Cargo.toml b/services/frontend/enclave/Cargo.toml
index 8fffb22..8ca073e 100644
--- a/services/frontend/enclave/Cargo.toml
+++ b/services/frontend/enclave/Cargo.toml
@@ -41,7 +41,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils" }
diff --git a/services/management/enclave/Cargo.toml b/services/management/enclave/Cargo.toml
index 548f058..48247dc 100644
--- a/services/management/enclave/Cargo.toml
+++ b/services/management/enclave/Cargo.toml
@@ -43,7 +43,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils" }
diff --git a/services/scheduler/enclave/Cargo.toml b/services/scheduler/enclave/Cargo.toml
index bf46e82..69503d4 100644
--- a/services/scheduler/enclave/Cargo.toml
+++ b/services/scheduler/enclave/Cargo.toml
@@ -39,7 +39,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils", optional = true }
diff --git a/services/storage/enclave/Cargo.toml b/services/storage/enclave/Cargo.toml
index 755597e..c206adc 100644
--- a/services/storage/enclave/Cargo.toml
+++ b/services/storage/enclave/Cargo.toml
@@ -39,7 +39,7 @@ teaclave_config = { path = "../../../config" }
teaclave_proto = { path = "../../proto" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_test_utils = { path = "../../../tests/utils", optional = true }
diff --git a/utils/service_app_utils/Cargo.toml b/services/utils/service_app_utils/Cargo.toml
similarity index 88%
rename from utils/service_app_utils/Cargo.toml
rename to services/utils/service_app_utils/Cargo.toml
index 6001fac..ac02241 100644
--- a/utils/service_app_utils/Cargo.toml
+++ b/services/utils/service_app_utils/Cargo.toml
@@ -13,4 +13,4 @@ env_logger = { version = "0.7.1" }
anyhow = { version = "1.0.26" }
log = { version = "0.4.6" }
-teaclave_binder = { path = "../../binder" }
+teaclave_binder = { path = "../../../binder" }
diff --git a/utils/service_app_utils/src/lib.rs b/services/utils/service_app_utils/src/lib.rs
similarity index 100%
rename from utils/service_app_utils/src/lib.rs
rename to services/utils/service_app_utils/src/lib.rs
diff --git a/utils/service_enclave_utils/Cargo.toml b/services/utils/service_enclave_utils/Cargo.toml
similarity index 81%
rename from utils/service_enclave_utils/Cargo.toml
rename to services/utils/service_enclave_utils/Cargo.toml
index 0b2b283..012a6d5 100644
--- a/utils/service_enclave_utils/Cargo.toml
+++ b/services/utils/service_enclave_utils/Cargo.toml
@@ -19,9 +19,9 @@ env_logger = { version = "0.7.1" }
log = { version = "0.4.6" }
teaclave_service_enclave_utils_proc_macro = { path = "./proc_macro" }
-teaclave_types = { path = "../../types" }
-teaclave_attestation = { path = "../../attestation" }
-teaclave_rpc = { path = "../../rpc" }
+teaclave_types = { path = "../../../types" }
+teaclave_attestation = { path = "../../../attestation" }
+teaclave_rpc = { path = "../../../rpc" }
sgx_cov = { version = "1.1.1", optional = true }
sgx_trts = { version = "1.1.1", optional = true }
diff --git a/utils/service_enclave_utils/proc_macro/Cargo.toml b/services/utils/service_enclave_utils/proc_macro/Cargo.toml
similarity index 100%
rename from utils/service_enclave_utils/proc_macro/Cargo.toml
rename to services/utils/service_enclave_utils/proc_macro/Cargo.toml
diff --git a/utils/service_enclave_utils/proc_macro/src/lib.rs b/services/utils/service_enclave_utils/proc_macro/src/lib.rs
similarity index 100%
rename from utils/service_enclave_utils/proc_macro/src/lib.rs
rename to services/utils/service_enclave_utils/proc_macro/src/lib.rs
diff --git a/utils/service_enclave_utils/src/lib.rs b/services/utils/service_enclave_utils/src/lib.rs
similarity index 100%
rename from utils/service_enclave_utils/src/lib.rs
rename to services/utils/service_enclave_utils/src/lib.rs
diff --git a/utils/service_enclave_utils/src/macros.rs b/services/utils/service_enclave_utils/src/macros.rs
similarity index 100%
rename from utils/service_enclave_utils/src/macros.rs
rename to services/utils/service_enclave_utils/src/macros.rs
diff --git a/tests/functional/enclave/Cargo.toml b/tests/functional/enclave/Cargo.toml
index 4b4341f..03111cc 100644
--- a/tests/functional/enclave/Cargo.toml
+++ b/tests/functional/enclave/Cargo.toml
@@ -40,7 +40,7 @@ teaclave_attestation = { path = "../../../attestation" }
teaclave_config = { path = "../../../config" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../../services/utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_proto = { path = "../../../services/proto" }
teaclave_test_utils = { path = "../../../tests/utils" }
diff --git a/tests/integration/enclave/Cargo.toml b/tests/integration/enclave/Cargo.toml
index 9cbc0f1..43253a3 100644
--- a/tests/integration/enclave/Cargo.toml
+++ b/tests/integration/enclave/Cargo.toml
@@ -44,7 +44,7 @@ teaclave_attestation = { path = "../../../attestation" }
teaclave_config = { path = "../../../config" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../../services/utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
teaclave_proto = { path = "../../../services/proto" }
teaclave_worker = { path = "../../../worker" }
diff --git a/tests/unit/enclave/Cargo.toml b/tests/unit/enclave/Cargo.toml
index faac207..42112d5 100644
--- a/tests/unit/enclave/Cargo.toml
+++ b/tests/unit/enclave/Cargo.toml
@@ -68,7 +68,7 @@ teaclave_attestation = { path = "../../../attestation" }
teaclave_config = { path = "../../../config" }
teaclave_binder = { path = "../../../binder" }
teaclave_rpc = { path = "../../../rpc" }
-teaclave_service_enclave_utils = { path = "../../../utils/service_enclave_utils" }
+teaclave_service_enclave_utils = { path = "../../../services/utils/service_enclave_utils" }
teaclave_types = { path = "../../../types" }
sgx_tstd = { version = "1.1.1", features = ["net", "thread", "backtrace"], optional = true }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org