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

Jump to bottom

feat(FI-846) Fix dependency structure #135

Merged
merged 5 commits into from
Jul 26, 2023
Merged

feat(FI-846) Fix dependency structure #135

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a950d00
change: dependency structure
NikolasHai Jul 25, 2023
ba6a149
add: dependencies
NikolasHai Jul 25, 2023
6f6b11a
fmt
NikolasHai Jul 25, 2023
4f39773
resolved MR threads
NikolasHai Jul 25, 2023
f512d6b
cleanup deps & the bazel build
roman-kashitsyn Jul 26, 2023
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
118 changes: 113 additions & 5 deletions Cargo.Bazel.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "d70ff2117bec3a349d65238680bd99ead9949d9f0d5a9af89fc05237cfe43e8f",
"checksum": "9c3d82812fbd47b477ddb03bbc46448707b03e701b3f97a3765e3e4808fd5644",
"crates": {
"aho-corasick 0.7.18": {
"name": "aho-corasick",
Expand Down Expand Up @@ -4519,6 +4519,57 @@
}
],
"library_target_name": "icrc1_test_env",
"common_attrs": {
"compile_data_glob": [
"**"
],
"deps": {
"common": [
{
"id": "anyhow 1.0.63",
"target": "anyhow"
},
{
"id": "candid 0.8.4",
"target": "candid"
},
{
"id": "serde 1.0.144",
"target": "serde"
}
],
"selects": {}
},
"edition": "2018",
"proc_macro_deps": {
"common": [
{
"id": "async-trait 0.1.71",
"target": "async_trait"
}
],
"selects": {}
},
"version": "0.1.0"
},
"license": null
},
"icrc1-test-env-replica 0.1.0": {
"name": "icrc1-test-env-replica",
"version": "0.1.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "icrc1_test_env_replica",
"crate_root": "lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "icrc1_test_env_replica",
"common_attrs": {
"compile_data_glob": [
"**"
Expand All @@ -4545,6 +4596,65 @@
"id": "ic-agent 0.22.0",
"target": "ic_agent"
},
{
"id": "rand 0.8.5",
"target": "rand"
},
{
"id": "ring 0.16.20",
"target": "ring"
}
],
"selects": {}
},
"edition": "2018",
"proc_macro_deps": {
"common": [
{
"id": "async-trait 0.1.71",
"target": "async_trait"
}
],
"selects": {}
},
"version": "0.1.0"
},
"license": null
},
"icrc1-test-env-state-machine 0.1.0": {
"name": "icrc1-test-env-state-machine",
"version": "0.1.0",
"repository": null,
"targets": [
{
"Library": {
"crate_name": "icrc1_test_env_state_machine",
"crate_root": "lib.rs",
"srcs": [
"**/*.rs"
]
}
}
],
"library_target_name": "icrc1_test_env_state_machine",
"common_attrs": {
"compile_data_glob": [
"**"
],
"deps": {
"common": [
{
"id": "anyhow 1.0.63",
"target": "anyhow"
},
{
"id": "candid 0.8.4",
"target": "candid"
},
{
"id": "hex 0.4.3",
"target": "hex"
},
{
"id": "ic-test-state-machine-client 2.2.1",
"target": "ic_test_state_machine_client"
Expand All @@ -4556,10 +4666,6 @@
{
"id": "ring 0.16.20",
"target": "ring"
},
{
"id": "serde 1.0.144",
"target": "serde"
}
],
"selects": {}
Expand Down Expand Up @@ -12570,6 +12676,8 @@
"binary_crates": [],
"workspace_members": {
"icrc1-test-env 0.1.0": "test/env",
"icrc1-test-env-replica 0.1.0": "test/env/replica",
"icrc1-test-env-state-machine 0.1.0": "test/env/state-machine",
"icrc1-test-replica 0.1.0": "test/replica",
"icrc1-test-runner 0.1.0": "test/runner",
"icrc1-test-suite 0.1.0": "test/suite"
Expand Down
26 changes: 25 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

members = [
"test/env",
"test/env/state-machine",
"test/env/replica",
"test/suite",
"test/runner",
"test/replica",
Expand Down
2 changes: 2 additions & 0 deletions WORKSPACE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ crates_repository(
manifests = [
"//:Cargo.toml",
"//test/env:Cargo.toml",
"//test/env/replica:Cargo.toml",
"//test/env/state-machine:Cargo.toml",
"//test/suite:Cargo.toml",
"//test/runner:Cargo.toml",
"//test/replica:Cargo.toml",
Expand Down
6 changes: 0 additions & 6 deletions test/env/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,5 @@ path = "lib.rs"
[dependencies]
anyhow = "1.0"
candid = "0.8"
garcon = "0.2.3"
hex = "0.4"
ic-agent = "0.22.0"
rand = "0.8.5"
ring = "0.16.20"
serde = "1"
async-trait = "0.1.71"
ic-test-state-machine-client = "2.2.1"
Loading
Loading