diff --git a/Cargo.lock b/Cargo.lock index 5434dfa232..ddd9852c6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4555,10 +4555,7 @@ dependencies = [ [[package]] name = "pocket-ic" version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9765eeff77b8750cf6258eaeea237b96607cd770aa3d4003f021924192b7e4e" dependencies = [ - "async-trait", "base64 0.13.1", "candid", "hex", @@ -4568,6 +4565,8 @@ dependencies = [ "serde", "serde_bytes", "serde_json", + "sha2 0.10.8", + "tokio", "tracing", "tracing-appender", "tracing-subscriber", @@ -4992,6 +4991,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", @@ -5430,9 +5430,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -5469,9 +5469,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -6134,9 +6134,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -6153,9 +6153,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 3750e32b20..7c551b6fca 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -127,7 +127,7 @@ ci_info = "0.14" junction = "1.0.0" [target.'cfg(unix)'.dependencies] -pocket-ic = "3.1.0" +pocket-ic = { path = "../../../ic/packages/pocket-ic" } [dev-dependencies] env_logger = "0.10" diff --git a/src/dfx/src/config/mod.rs b/src/dfx/src/config/mod.rs index 584c04e8cb..5c649dde6b 100644 --- a/src/dfx/src/config/mod.rs +++ b/src/dfx/src/config/mod.rs @@ -5,8 +5,13 @@ pub mod cache; lazy_static! { // This expect cannot happen, we make sure that CARGO_PKG_VERSION is correct. - static ref VERSION: Version = - Version::parse(env!("CARGO_PKG_VERSION")).expect("Cannot parse version."); + static ref VERSION: Version = { + let version_str = env!("CARGO_PKG_VERSION"); + dbg!(version_str); + let version_cleaned = version_str.split('+').next().expect("Cannot parse version."); + dbg!(version_cleaned); + Version::parse("1.2.3").expect("Cannot parse version.") + }; static ref VERSION_STR: String = env!("CARGO_PKG_VERSION").to_string(); }