fix path on exec scripts

skyekiwi · Jan 5, 2022 · c26d3de · c26d3de
1 parent 658fbe9
commit c26d3de
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 58 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,13 @@ node_modules/
 /host/mock/*.contract
 /host/mock/*.wasm
 /host/mock/*.json
+
+enclave/lib/*.a
+enclave/bin/app
+enclave/bin/enclave.signed.so
+enclave/enclave/enclave.so
+
+**/*.c
+**/*.a
+**/*.h
+**/*.o
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,5 +6,18 @@ members = [
     'skw-pallets/s-contract',
     'skw-runtime',
 ]
+
+exclude = [
+    'enclave/app',
+    'enclave/enclave',
+    'enclave/crates/skw-crypto',
+    'enclave/crates/skw-driver',
+    'enclave/crates/skw-file',
+    'enclave/crates/skw-ipfs',
+    'enclave/crates/skw-metadata',
+    'enclave/crates/skw-types',
+    'enclave/crates/skw-unit-test',
+    'enclave/crates/skw-utils',
+]
 [profile.release]
 panic = 'unwind'
diff --git a/enclave/app/Cargo.lock b/enclave/app/Cargo.lock
diff --git a/enclave/app/Cargo.toml b/enclave/app/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["SkyeKiwi <[email protected]>"]
 build = "build.rs"
 
 [dependencies]
-sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
-sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk.git" }
+sgx_types = { path = "../../teaclave-sgx-sdk/sgx_types" }
+sgx_urts = { path = "../../teaclave-sgx-sdk/sgx_urts" }
diff --git a/enclave/enclave/Cargo.lock b/enclave/enclave/Cargo.lock
diff --git a/mock-enclave/wasm/greeting.wasm b/mock-enclave/wasm/greeting.wasm
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,4 +1 @@
-[toolchain]
-channel = "nightly-2021-11-11"
-components = ["rustfmt"]
-targets = ["wasm32-unknown-unknown"]
+nightly-2021-11-11
diff --git a/scripts/enclave-sim.cjs b/scripts/enclave-sim.cjs
@@ -7,8 +7,8 @@ console.log('$ yarn enclave:sim', process.argv.slice(2).join(' '));
 
 function runInDocker() {
 
-  const pathName = path.join(__dirname, "./enclave");
-  execSync(`sudo docker run -v ${pathName}:/root/sgx -it baiduxlab/sgx-rust bash -c "cd /root/sgx && export SGX_MODE=SW && bash"`);
+  const pathName = path.join(__dirname, "..");
+  execSync(`sudo docker run -v ${pathName}:/root/sgx -it baiduxlab/sgx-rust bash -c "cd /root/sgx/enclave && export SGX_MODE=SW && bash"`);
 }
 
 runInDocker()