Skip to content

Commit 32b9716

Browse files
sgreenburysgreenbury
authored
Merge pull request #192 from alan-turing-institute/174-update-deps-restructure
Remove unused deps, autoinherit and restructure (#174)
2 parents 4c25cf1 + 74d6d15 commit 32b9716

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+246
-251
lines changed

‎Cargo.toml‎

Lines changed: 59 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,67 @@ description = "Trustchain decentralised PKI reference implementation."
77
homepage = "https://alan-turing-institute.github.io/trustchain/"
88
repository = "https://github.com/alan-turing-institute/trustchain/"
99
keywords = ["pki", "did", "vc", "vp"]
10-
edition = "2021"
10+
edition = "2021"
1111

1212
[workspace]
13-
members = [
14-
"trustchain-core",
15-
"trustchain-ion",
16-
"trustchain-http",
17-
"trustchain-api",
18-
"trustchain-cli",
19-
"trustchain-ffi"
20-
]
13+
members = ["crates/*"]
2114
resolver = "2"
2215

16+
[workspace.dependencies]
17+
anyhow = "1.0"
18+
async-trait = "0.1"
19+
axum = "0.6"
20+
axum-server = "0.5.1"
21+
axum-test-helper = "0.2.0"
22+
bip39 = "2.0.0"
23+
bitcoin = "0.29.2"
24+
bitcoincore-rpc = "0.16.0"
25+
chrono = "0.4.26"
26+
clap = "4.0.32"
27+
did-ion = { git = "https://github.com/alan-turing-institute/ssi.git", rev = "1aa3223a384ee71df1333bbce04af445e852eab5" }
28+
did-method-key = { git = "https://github.com/alan-turing-institute/ssi.git", rev = "1aa3223a384ee71df1333bbce04af445e852eab5" }
29+
ed25519-dalek-bip32 = "0.3.0"
30+
flate2 = "1.0.24"
31+
flutter_rust_bridge = "=1.64.0"
32+
futures = "0.3.28"
33+
glob = "0.3"
34+
hex = "0.4.3"
35+
hyper = "0.14.26"
36+
image = "0.23.14"
37+
ipfs-api-backend-hyper = "0.6"
38+
ipfs-hasher = "0.13.0"
39+
is_empty = "0.2.0"
40+
itertools = "0.13.0"
41+
josekit = "0.8"
42+
k256 = "0.13.1"
43+
lazy_static = "1.4.0"
44+
log = "0.4"
45+
mockall = "0.11.4"
46+
mongodb = "2.3.1"
47+
petgraph = "0.6"
48+
ps_sig = { git = "https://github.com/alan-turing-institute/RSS.git", rev = "ec9386e125d87c5f54898b34fbe0883b3b36ffd4" }
49+
qrcode = "0.12.0"
50+
rand = "0.8"
51+
reqwest = "0.11.16"
52+
secp256k1 = "0.27.0"
53+
serde = "1.0"
54+
serde_jcs = "0.1.0"
55+
serde_json = "1.0"
56+
serde_with = "3.4.0"
57+
sha2 = "0.10.7"
58+
shellexpand = "3.1.0"
59+
ssi = { git = "https://github.com/alan-turing-institute/ssi.git", rev = "1aa3223a384ee71df1333bbce04af445e852eab5" }
60+
tempfile = "3.9.0"
61+
thiserror = "1.0"
62+
tokio = "1.20.1"
63+
toml = "0.7.2"
64+
tower = "0.4"
65+
tracing = "0.1"
66+
tracing-subscriber = "0.3"
67+
2368
[dependencies]
24-
trustchain-api = { path = "./trustchain-api", version = "0.1.0"}
25-
trustchain-core = { path = "./trustchain-core", version = "0.2.0"}
26-
trustchain-ffi = { path = "./trustchain-ffi", version = "0.1.0"}
27-
trustchain-http = { path = "./trustchain-http", version = "0.1.0"}
28-
trustchain-ion = { path = "./trustchain-ion", version = "0.2.0"}
69+
trustchain-api = { path = "crates/trustchain-api", version = "0.1.0" }
70+
trustchain-core = { path = "crates/trustchain-core", version = "0.2.0" }
71+
trustchain-ffi = { path = "crates/trustchain-ffi", version = "0.1.0" }
72+
trustchain-http = { path = "crates/trustchain-http", version = "0.1.0" }
73+
trustchain-ion = { path = "crates/trustchain-ion", version = "0.2.0" }

‎crates/trustchain-api/Cargo.toml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
name = "trustchain-api"
3+
version = "0.1.0"
4+
authors = ["Trustchain Devs"]
5+
edition = "2021"
6+
7+
[dependencies]
8+
9+
async-trait = { workspace = true }
10+
chrono = { workspace = true }
11+
did-ion = { workspace = true }
12+
futures = { workspace = true }
13+
hex = { workspace = true }
14+
ps_sig = { workspace = true }
15+
serde_json = { workspace = true }
16+
sha2 = { workspace = true }
17+
ssi = { workspace = true, features = ["http-did", "secp256k1", "rss"] }
18+
trustchain-core = { path = "../trustchain-core" }
19+
trustchain-ion = { path = "../trustchain-ion" }
20+
21+
[dev-dependencies]
22+
tokio = { workspace = true, features = ["full"] }

trustchain-api/src/api.rs renamed to crates/trustchain-api/src/api.rs

File renamed without changes.

trustchain-api/src/lib.rs renamed to crates/trustchain-api/src/lib.rs

File renamed without changes.

‎crates/trustchain-cli/Cargo.toml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[package]
2+
name = "trustchain-cli"
3+
version = "0.1.0"
4+
authors = ["Trustchain Devs"]
5+
edition = "2021"
6+
7+
[[bin]]
8+
name = "trustchain-cli"
9+
path = "src/bin/main.rs"
10+
11+
[dependencies]
12+
13+
clap = { workspace = true, features = ["derive", "cargo"] }
14+
lazy_static = { workspace = true }
15+
serde = { workspace = true, features = ["derive"] }
16+
serde_json = { workspace = true }
17+
ssi = { workspace = true, features = ["http-did", "secp256k1", "rss"] }
18+
tokio = { workspace = true, features = ["full"] }
19+
toml = { workspace = true }
20+
trustchain-api = { path = "../trustchain-api" }
21+
trustchain-core = { path = "../trustchain-core" }
22+
trustchain-http = { path = "../trustchain-http" }
23+
trustchain-ion = { path = "../trustchain-ion" }

trustchain-cli/src/bin/main.rs renamed to crates/trustchain-cli/src/bin/main.rs

File renamed without changes.

trustchain-cli/src/config.rs renamed to crates/trustchain-cli/src/config.rs

File renamed without changes.

trustchain-cli/src/lib.rs renamed to crates/trustchain-cli/src/lib.rs

File renamed without changes.

‎crates/trustchain-core/Cargo.toml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
name = "trustchain-core"
3+
version = "0.2.0"
4+
authors = ["Trustchain Devs"]
5+
edition = "2021"
6+
7+
[dependencies]
8+
async-trait = { workspace = true }
9+
base64 = "0.13"
10+
did-method-key = { workspace = true }
11+
petgraph = { workspace = true }
12+
serde = { workspace = true, features = ["derive"] }
13+
serde_jcs = { workspace = true }
14+
serde_json = { workspace = true }
15+
sha2 = { workspace = true }
16+
ssi = { workspace = true, features = ["http-did", "secp256k1", "rss"] }
17+
tempfile = { workspace = true }
18+
thiserror = { workspace = true }
19+
20+
[dev-dependencies]
21+
mockall = { workspace = true }

trustchain-core/src/attestor.rs renamed to crates/trustchain-core/src/attestor.rs

File renamed without changes.

0 commit comments

Comments
 (0)