Skip to content

Commit

Permalink
Merge branch 'ulan/run-819-serde' into 'master'
Browse files Browse the repository at this point in the history
RUN-819: Upgrade `serde`

This upgrades `serde`, which also requires a new version of
`icrc1-test-suite` that doesn't pin `serde`:
dfinity/ICRC-1@6eda22d

This also bumps the size limit of `governance-canister_test.wasm`,
which became larger with the new `serde`. 

See merge request dfinity-lab/public/ic!15731
  • Loading branch information
ulan committed Oct 27, 2023
2 parents 843f26d + 97642ee commit c7ed3f9
Show file tree
Hide file tree
Showing 8 changed files with 682 additions and 614 deletions.
390 changes: 220 additions & 170 deletions Cargo.Bazel.Fuzzing.json.lock

Large diffs are not rendered by default.

72 changes: 40 additions & 32 deletions Cargo.Bazel.Fuzzing.toml.lock
Expand Up @@ -197,7 +197,7 @@ dependencies = [
"serde_urlencoded",
"smallvec",
"socket2 0.5.4",
"time 0.3.26",
"time 0.3.30",
"url",
]

Expand Down Expand Up @@ -497,7 +497,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -1906,7 +1906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
dependencies = [
"percent-encoding 2.3.0",
"time 0.3.26",
"time 0.3.30",
"version_check",
]

Expand Down Expand Up @@ -2470,6 +2470,9 @@ name = "deranged"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
dependencies = [
"powerfmt",
]

[[package]]
name = "derivative"
Expand Down Expand Up @@ -2846,7 +2849,7 @@ dependencies = [
"thousands",
"thread_profiler",
"threadpool",
"time 0.3.26",
"time 0.3.30",
"tiny-keccak",
"tiny_http",
"tokio",
Expand Down Expand Up @@ -4342,7 +4345,7 @@ dependencies = [
"sha2 0.10.8",
"simple_asn1",
"thiserror",
"time 0.3.26",
"time 0.3.30",
"tokio",
"url",
]
Expand Down Expand Up @@ -4557,7 +4560,7 @@ dependencies = [
"strum 0.24.1",
"strum_macros 0.24.3",
"thiserror",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -4620,8 +4623,7 @@ dependencies = [
[[package]]
name = "icrc1-test-env"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1de228913a69be63eec41a6435701d5c1daa6b4e156a92748cf5c50690ca8e40"
source = "git+https://github.com/dfinity/ICRC-1?rev=6eda22d0dc882b347a945647902f2d844a404c7f#6eda22d0dc882b347a945647902f2d844a404c7f"
dependencies = [
"anyhow",
"async-trait",
Expand All @@ -4633,8 +4635,7 @@ dependencies = [
[[package]]
name = "icrc1-test-suite"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "917e17fd43d9afc946d75422a1282ecacb03867dfee9ab3863868388c9a4b127"
source = "git+https://github.com/dfinity/ICRC-1?rev=6eda22d0dc882b347a945647902f2d844a404c7f#6eda22d0dc882b347a945647902f2d844a404c7f"
dependencies = [
"anyhow",
"candid",
Expand Down Expand Up @@ -7060,6 +7061,12 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"

[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"

[[package]]
name = "pprof"
version = "0.12.1"
Expand Down Expand Up @@ -7348,7 +7355,7 @@ dependencies = [
"reqwest",
"serde",
"serde_json",
"time 0.3.26",
"time 0.3.30",
"url",
]

Expand Down Expand Up @@ -7871,7 +7878,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem 1.1.1",
"ring",
"time 0.3.26",
"time 0.3.30",
"yasna",
]

Expand All @@ -7883,7 +7890,7 @@ checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6"
dependencies = [
"pem 3.0.2",
"ring",
"time 0.3.26",
"time 0.3.30",
"yasna",
"zeroize",
]
Expand Down Expand Up @@ -8634,9 +8641,9 @@ dependencies = [

[[package]]
name = "serde"
version = "1.0.171"
version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
dependencies = [
"serde_derive",
]
Expand Down Expand Up @@ -8703,9 +8710,9 @@ dependencies = [

[[package]]
name = "serde_derive"
version = "1.0.171"
version = "1.0.190"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
dependencies = [
"proc-macro2 1.0.69",
"quote 1.0.33",
Expand Down Expand Up @@ -9024,7 +9031,7 @@ dependencies = [
"num-bigint 0.4.4",
"num-traits",
"thiserror",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand All @@ -9044,7 +9051,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
dependencies = [
"log",
"termcolor",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -9114,7 +9121,7 @@ dependencies = [
"serde",
"serde_json",
"slog",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -9149,7 +9156,7 @@ dependencies = [
"slog",
"term 0.7.0",
"thread_local",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -9793,30 +9800,31 @@ dependencies = [

[[package]]
name = "time"
version = "0.3.26"
version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07"
checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
dependencies = [
"deranged",
"itoa",
"libc",
"num_threads",
"powerfmt",
"serde",
"time-core",
"time-macros",
]

[[package]]
name = "time-core"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

[[package]]
name = "time-macros"
version = "0.2.12"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451"
checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
dependencies = [
"time-core",
]
Expand All @@ -9839,7 +9847,7 @@ dependencies = [
"ascii",
"chunked_transfer",
"log",
"time 0.3.26",
"time 0.3.30",
"url",
]

Expand Down Expand Up @@ -10220,7 +10228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [
"crossbeam-channel",
"time 0.3.26",
"time 0.3.30",
"tracing-subscriber",
]

Expand Down Expand Up @@ -11537,7 +11545,7 @@ dependencies = [
"oid-registry",
"rusticata-macros",
"thiserror",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand All @@ -11555,7 +11563,7 @@ dependencies = [
"ring",
"rusticata-macros",
"thiserror",
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down Expand Up @@ -11603,7 +11611,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
dependencies = [
"time 0.3.26",
"time 0.3.30",
]

[[package]]
Expand Down

0 comments on commit c7ed3f9

Please sign in to comment.