Skip to content

Commit

Permalink
Replace vc_util and canister_sig_util with external crates (#2584)
Browse files Browse the repository at this point in the history
The canister_sig_util crate has been replace by the properly published
`ic-canister-sig-creation` crate. The `vc_util` crate has been moved to
the verifiable credentials SDK repo.
This PR removes a lot of duplication and streamlines the II repo massively.
Also, having more external crates should improve caching in the II CI
infrastructure.
  • Loading branch information
Frederik Rothenberger authored Sep 3, 2024
1 parent 56aa7f4 commit 11f35c8
Show file tree
Hide file tree
Showing 26 changed files with 751 additions and 2,940 deletions.
400 changes: 314 additions & 86 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
members = [
"src/asset_util",
"src/internet_identity",
"src/canister_sig_util",
"src/canister_tests",
"src/internet_identity_interface",
"src/archive",
"src/vc_util",
"src/sig-verifier-js"
]
resolver = "2"
Expand All @@ -20,10 +18,8 @@ opt-level = 'z'
[workspace.dependencies]
# local dependencies
asset_util = { path = "src/asset_util" }
canister_sig_util = { path = "src/canister_sig_util" }
canister_tests = { path = "src/canister_tests" }
internet_identity_interface = { path = "src/internet_identity_interface" }
vc_util = { path = "src/vc_util" }

# ic dependencies
candid = "0.10"
Expand All @@ -37,7 +33,9 @@ ic-metrics-encoder = "1"
ic-representation-independent-hash = "2.2"
ic-response-verification = "2.2"
ic-stable-structures = "0.6"
ic-verifiable-credentials = {git = "https://github.com/dfinity/verifiable-credentials-sdk", rev = "2bc90b2ce7355ba68001fcc484bdc31f2fe8e820"}
ic-crypto-standalone-sig-verifier = { git = "https://github.com/dfinity/ic", rev = "e69bcc7b319cbb3ebc22ec55af35287741244db6" }
ic-canister-sig-creation = "1.1"
ic-types = { git = "https://github.com/dfinity/ic", rev = "e69bcc7b319cbb3ebc22ec55af35287741244db6" }
pocket-ic = "4.0"

Expand Down
6 changes: 0 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ COPY src/internet_identity/Cargo.toml src/internet_identity/Cargo.toml
COPY src/internet_identity_interface/Cargo.toml src/internet_identity_interface/Cargo.toml
COPY src/archive/Cargo.toml src/archive/Cargo.toml
COPY src/canister_tests/Cargo.toml src/canister_tests/Cargo.toml
COPY src/canister_sig_util/Cargo.toml src/canister_sig_util/Cargo.toml
COPY src/vc_util/Cargo.toml src/vc_util/Cargo.toml
COPY src/sig-verifier-js/Cargo.toml src/sig-verifier-js/Cargo.toml
COPY src/asset_util/Cargo.toml src/asset_util/Cargo.toml
ENV CARGO_TARGET_DIR=/cargo_target
Expand All @@ -63,10 +61,6 @@ RUN mkdir -p src/internet_identity/src \
&& touch src/archive/src/lib.rs \
&& mkdir -p src/canister_tests/src \
&& touch src/canister_tests/src/lib.rs \
&& mkdir -p src/canister_sig_util/src \
&& touch src/canister_sig_util/src/lib.rs \
&& mkdir -p src/vc_util/src \
&& touch src/vc_util/src/lib.rs \
&& mkdir -p src/sig-verifier-js/src \
&& touch src/sig-verifier-js/src/lib.rs \
&& mkdir -p src/asset_util/src \
Expand Down
Loading

0 comments on commit 11f35c8

Please sign in to comment.