Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify primitives + remove bin2 #267

Merged
merged 4 commits into from
Jun 23, 2021
Merged

Unify primitives + remove bin2 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec200d2
move substratee-node-primitives to primitives/node
clangenb Jun 7, 2021
7517a71
move substratee-worker-primitives to primitives/worker
clangenb Jun 7, 2021
a4a16f0
remove bin2. It is no longer necessary.
clangenb Jun 7, 2021
779608b
Revert `SGX_MODE=SW` and cleanup workspace file
clangenb Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
bin/*.so
bin/substratee-*
bin/*.wasm
bin2/substratee-*

# sealed data
bin/*.bin
Expand Down Expand Up @@ -54,13 +53,6 @@ bin/shards
bin/*.der
bin/enclave-shielding-pubkey.json

# in order to have 2 workers run and exchange keys
bin2/substratee-worker
bin2/*.bin
bin2/*.txt
bin2/shards
bin2/enclave-shielding-pubkey.json

# client
client/my_keystore
client/my_trusted_keystore
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[workspace]
members = [
"client",
"primitives/settings",
"primitives/node",
"primitives/worker",
"stf",
"worker",
"worker/worker-api",
"substratee-node-primitives",
"substratee-worker-primitives",
"client",
"stf",
# "enclave",
]

Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ $(Worker_Name): $(Worker_Enclave_u_Object) $(Worker_SRC_Files)
@cd worker && SGX_SDK=$(SGX_SDK) SGX_MODE=$(SGX_MODE) cargo build $(Worker_Rust_Flags)
@echo "Cargo => $@"
cp $(Worker_Rust_Path)/substratee-worker ./bin
cp $(Worker_Rust_Path)/substratee-worker ./bin2

######## SubstraTEE-client objects ########
$(Client_Name): $(Client_SRC_Files)
Expand Down
1 change: 0 additions & 1 deletion bin2/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ git = "https://github.com/scs/substraTEE-node"
package = "substratee-node-runtime"

[dependencies.substratee-worker-primitives]
path = "../substratee-worker-primitives"
path = "../primitives/worker"

[dependencies.substratee-stf]
path = "../stf"
Expand Down
4 changes: 2 additions & 2 deletions enclave/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ git = "https://github.com/scs/sgx-runtime"
default-features = false

[dependencies.substratee-node-primitives]
path = "../substratee-node-primitives"
path = "../primitives/node"
default-features = false
features = ["sgx"]

[dependencies.substratee-worker-primitives]
path = "../substratee-worker-primitives"
path = "../primitives/worker"
default-features = false
features = ["sgx"]

Expand Down
0 substratee-node-primitives/Cargo.toml → primitives/node/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 substratee-node-primitives/src/lib.rs → primitives/node/src/lib.rs
View file
Open in desktop
File renamed without changes.
0 substratee-worker-primitives/Cargo.toml → primitives/worker/Cargo.toml
View file
Open in desktop
File renamed without changes.
0 substratee-worker-primitives/src/block.rs → primitives/worker/src/block.rs
View file
Open in desktop
File renamed without changes.
0 substratee-worker-primitives/src/lib.rs → primitives/worker/src/lib.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion stf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ version = "3.0.0"
optional = true

[dependencies.substratee-worker-primitives]
path = "../substratee-worker-primitives"
path = "../primitives/worker"
default-features = false
features = ["sgx"]
optional = true
Expand Down
4 changes: 2 additions & 2 deletions worker/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ substratee-settings = { path = "../primitives/settings" }
git = "https://github.com/scs/substrate-api-client"

[dependencies.substratee-node-primitives]
path = "../substratee-node-primitives"
path = "../primitives/node"

[dependencies.substratee-worker-primitives]
path = "../substratee-worker-primitives"
path = "../primitives/worker"

[dependencies.substratee-worker-api]
path = "worker-api"
Expand Down
2 changes: 1 addition & 1 deletion worker/worker-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ sgx_crypto_helper = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }

[dependencies.substratee-worker-primitives]
path = "../../substratee-worker-primitives"
path = "../../primitives/worker"