remove unused dependencies

Signed-off-by: Jun Kimura <[email protected]>
datachainlab · Jun 10, 2023 · 7750bc8 · 7750bc8
1 parent 09cf81d
commit 7750bc8
Show file tree

Hide file tree

Showing 26 changed files with 7 additions and 179 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,23 +18,6 @@ jobs:
       - run: make lint-tools
       - run: make lint
 
-  udeps:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-            toolchain: nightly
-      - uses: datachainlab/rust-cache@allow_registry_src_caching
-        with:
-          workspaces: |
-            .
-            ./enclave
-          cache-directories: |
-            ~/.cargo/registry/src/**/librocksdb-sys-*
-      - run: make lint-tools
-      - run: make udeps
-
   relayer:
     runs-on: ubuntu-22.04
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -188,6 +188,11 @@ proto:
 
 ######## Lint ########
 
+.PHONY: udeps-tools
+lint-tools:
+	rustup component add rustfmt clippy
+	cargo install cargo-machete
+
 .PHONY: fmt
 fmt:
 	@cargo fmt --all $(CARGO_FMT_OPT) && cd ./enclave && cargo fmt --all $(CARGO_FMT_OPT)
@@ -196,14 +201,11 @@ fmt:
 lint:
 	@$(MAKE) CARGO_FMT_OPT=--check fmt
 	@cargo clippy --locked --tests $(CARGO_TARGET) -- -D warnings
-
-.PHONY: udeps-tools
-lint-tools:
-	rustup component add rustfmt clippy
-	cargo +nightly install cargo-udeps --locked
+	@cargo machete
 
 .PHONY: udeps
 udeps:
+	@cargo +nightly install cargo-udeps --locked
 	@cargo +nightly udeps --locked --lib --tests $(CARGO_TARGET)
 
 ######## Tools ########

diff --git a/app/Cargo.toml b/app/Cargo.toml
@@ -8,9 +8,6 @@ description  = """
 """
 
 [dependencies]
-sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-sgx_urts = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-
 log = "0.4.8"
 env_logger = "0.9.0"
 hex = { version = "0.4", default-features = false, features = ["alloc"] }

diff --git a/enclave-modules/ecall-handler/Cargo.toml b/enclave-modules/ecall-handler/Cargo.toml
@@ -5,23 +5,17 @@ edition = "2021"
 
 [dependencies]
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
-prost-types = { version = "0.11", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["alloc"] }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
-log = { version = "0.4.8", default-features = false }
 flex-error = { version = "0.4.4", default-features = false }
 
-enclave-utils = { path = "../utils" }
 enclave-remote-attestation = { path = "../remote-attestation" }
 crypto = { path = "../../modules/crypto", default-features = false, features = ["sgx"] }
 attestation-report = { path = "../../modules/attestation-report", default-features = false, features = ["sgx"] }
 context = { path = "../../modules/context", default-features = false }
 enclave-environment = { path = "../environment", default-features = false }
-bincode = { git = "https://github.com/bluele/bincode-sgx", branch = "serde" }
 
 lcp-types = { path = "../../modules/types", default-features = false }
 light-client-registry = { path = "../../modules/light-client-registry", default-features = false }
-settings = { path = "../../modules/settings", default-features = false }
 ecall-commands = { path = "../../modules/ecall-commands", default-features = false }
 commitments = { path = "../../modules/commitments", default-features = false, features = ["prover"] }
 light-client = { path = "../../modules/light-client", default-features = false }

diff --git a/enclave-modules/remote-attestation/Cargo.toml b/enclave-modules/remote-attestation/Cargo.toml
@@ -6,24 +6,19 @@ edition = "2021"
 [dependencies]
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_tstd = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", features = ["net"] }
-sgx_trts = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_tse = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_tcrypto = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 
-serde = { version = "1.0", default-features = false, features = ["alloc"] }
-serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 itertools = { version = "0.8", default-features = false, features = [] }
 log = { version = "0.4.8", default-features = false }
 base64 = { git = "https://github.com/marshallpierce/rust-base64", default-features = false, features = ["alloc"] }
-hex = { version = "0.4", default-features = false, features = ["alloc"] }
 httparse = { version = "1.3", default-features = false }
 chrono = { version = "0.4.19", default-features = false, features = ["alloc"]}
 flex-error = { version = "0.4.4", default-features = false }
 
 webpki = { git = "https://github.com/mesalock-linux/webpki", branch = "mesalock_sgx" }
 webpki-roots = { git = "https://github.com/mesalock-linux/webpki-roots", rev = "6ff3be547ac13ccd46ae55605ad6506ce30688ef" }
 rustls = { git = "https://github.com/mesalock-linux/rustls", branch = "mesalock_sgx" }
-bincode = { git = "https://github.com/bluele/bincode-sgx", branch = "serde" }
 
 host-api = { path = "../host-api" }
 

diff --git a/enclave-modules/runtime/Cargo.toml b/enclave-modules/runtime/Cargo.toml
@@ -7,19 +7,14 @@ edition = "2021"
 sgx_types = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 sgx_tstd = { rev = "v1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk" }
 log = { version = "0.4.8", default-features = false }
-lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
 bincode = { git = "https://github.com/bluele/bincode-sgx", branch = "serde" }
 flex-error = { version = "0.4.4", default-features = false }
 once_cell = { version = "1.15.0", default-features = false, features = ["alloc"] }
 
 enclave-utils = { path = "../utils" }
-enclave-store = { path = "../store" }
 ecall-handler = { path = "../ecall-handler" }
 enclave-environment = { path = "../environment" }
 crypto = { path = "../../modules/crypto", default-features = false, features = ["sgx"] }
-light-client-registry = { path = "../../modules/light-client-registry", default-features = false, features = ["sgx"] }
-
-store = { path = "../../modules/store", default-features = false }
 ecall-commands = { path = "../../modules/ecall-commands", default-features = false }
 
 [features]

diff --git a/enclave-modules/store/Cargo.toml b/enclave-modules/store/Cargo.toml
@@ -3,12 +3,6 @@ name = "enclave-store"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-flex-error = { version = "0.4.4", default-features = false }
-
 host-api = { path = "../host-api" }
-
 store = { path = "../../modules/store", default-features = false }
-ocall-commands = { path = "../../modules/ocall-commands", default-features = false }