diff --git a/Cargo.toml b/Cargo.toml index 797b227b5..e4cd45752 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,11 +60,11 @@ borsh = { version = "1", default-features = false, features = [ "deriv displaydoc = { version = "0.2", default-features = false } prost = { version = "0.12", default-features = false } derive_more = { version = "0.99.17", default-features = false, features = [ "from", "into", "display", "try_into" ] } -rstest = { version = "0.19" } +rstest = { version = "0.21" } schemars = { version = "0.8.15" } sha2 = { version = "0.10.8", default-features = false } serde = { version = "1.0", default-features = false } -serde_json = { package = "serde-json-wasm", version = "1.0.1", default-features = false } +serde-json = { package = "serde-json-wasm", version = "1.0.1", default-features = false } subtle-encoding = { version = "0.5", default-features = false } # ibc dependencies diff --git a/ci/cw-check/Cargo.toml b/ci/cw-check/Cargo.toml index fdb27f2cd..31627ddc3 100644 --- a/ci/cw-check/Cargo.toml +++ b/ci/cw-check/Cargo.toml @@ -7,11 +7,11 @@ version = "0.1.0" crate-type = [ "cdylib", "rlib" ] [dependencies] -ibc-apps = { path = "../../ibc-apps", default_features = false, features = [ "serde", "parity-scale-codec" ] } +ibc-apps = { path = "../../ibc-apps", default-features = false, features = [ "serde", "parity-scale-codec" ] } ibc-core = { path = "../../ibc-core", features = [ "serde", "parity-scale-codec", "schema" ] } cosmwasm-std = { version = "1.5.4", default-features = false } cosmwasm-schema = { version = "1.5.4", default-features = false } -serde_json = { package = "serde-json-wasm", version = "^1.0.1", default-features = false } +serde-json = { package = "serde-json-wasm", version = "^1.0.1", default-features = false } thiserror = { version = "^1.0", default-features = false } [profile.release] diff --git a/ibc-apps/ics20-transfer/Cargo.toml b/ibc-apps/ics20-transfer/Cargo.toml index b904e0902..0f36a3700 100644 --- a/ibc-apps/ics20-transfer/Cargo.toml +++ b/ibc-apps/ics20-transfer/Cargo.toml @@ -20,7 +20,7 @@ all-features = true [dependencies] # external dependencies -serde_json = { workspace = true, optional = true } +serde-json = { workspace = true, optional = true } # ibc dependencies ibc-core = { workspace = true } @@ -34,12 +34,12 @@ default = [ "std" ] std = [ "ibc-app-transfer-types/std", "ibc-core/std", - "serde_json/std", + "serde-json/std", ] serde = [ "ibc-app-transfer-types/serde", "ibc-core/serde", - "serde_json", + "dep:serde-json", ] schema = [ "ibc-app-transfer-types/schema", diff --git a/ibc-apps/ics20-transfer/types/Cargo.toml b/ibc-apps/ics20-transfer/types/Cargo.toml index f967ce8f7..5d8da8aca 100644 --- a/ibc-apps/ics20-transfer/types/Cargo.toml +++ b/ibc-apps/ics20-transfer/types/Cargo.toml @@ -37,14 +37,14 @@ parity-scale-codec = { workspace = true, optional = true } scale-info = { workspace = true, optional = true } [dev-dependencies] -serde_json = { workspace = true } +serde-json = { workspace = true } rstest = { workspace = true } [features] default = [ "std" ] std = [ "serde/std", - "serde_json/std", + "serde-json/std", "displaydoc/std", "uint/std", "primitive-types/std", diff --git a/ibc-apps/ics721-nft-transfer/Cargo.toml b/ibc-apps/ics721-nft-transfer/Cargo.toml index f1146b970..2b3149f99 100644 --- a/ibc-apps/ics721-nft-transfer/Cargo.toml +++ b/ibc-apps/ics721-nft-transfer/Cargo.toml @@ -20,7 +20,7 @@ all-features = true [dependencies] # external dependencies -serde_json = { workspace = true, optional = true } +serde-json = { workspace = true, optional = true } # ibc dependencies ibc-app-nft-transfer-types = { workspace = true } @@ -31,12 +31,12 @@ default = [ "std" ] std = [ "ibc-app-nft-transfer-types/std", "ibc-core/std", - "serde_json/std", + "serde-json/std", ] serde = [ "ibc-app-nft-transfer-types/serde", "ibc-core/serde", - "serde_json", + "dep:serde-json", ] schema = [ "ibc-app-nft-transfer-types/schema", diff --git a/ibc-apps/ics721-nft-transfer/types/Cargo.toml b/ibc-apps/ics721-nft-transfer/types/Cargo.toml index b520aebdc..a490538be 100644 --- a/ibc-apps/ics721-nft-transfer/types/Cargo.toml +++ b/ibc-apps/ics721-nft-transfer/types/Cargo.toml @@ -28,7 +28,7 @@ http = { version = "1.0.0" } mime = { version = "0.3.17" } schemars = { workspace = true, optional = true } serde = { workspace = true, optional = true } -serde_json = { workspace = true } +serde-json = { workspace = true } # ibc dependencies ibc-core = { workspace = true } @@ -46,7 +46,7 @@ rstest = { workspace = true } default = [ "std" ] std = [ "serde/std", - "serde_json/std", + "serde-json/std", "base64/std", "displaydoc/std", "http/std", diff --git a/ibc-clients/ics07-tendermint/types/Cargo.toml b/ibc-clients/ics07-tendermint/types/Cargo.toml index d52a1f260..8bb4b70ec 100644 --- a/ibc-clients/ics07-tendermint/types/Cargo.toml +++ b/ibc-clients/ics07-tendermint/types/Cargo.toml @@ -41,7 +41,7 @@ parity-scale-codec = { workspace = true, optional = true } scale-info = { workspace = true, optional = true } [dev-dependencies] -serde_json = { workspace = true } +serde-json = { workspace = true } tendermint-rpc = { workspace = true } [features] @@ -49,7 +49,7 @@ default = [ "std" ] std = [ "displaydoc/std", "serde/std", - "serde_json/std", + "serde-json/std", "ibc-core-client-types/std", "ibc-core-commitment-types/std", "ibc-core-host-types/std", diff --git a/ibc-clients/ics08-wasm/types/Cargo.toml b/ibc-clients/ics08-wasm/types/Cargo.toml index 57c73e78b..70b62e6a1 100644 --- a/ibc-clients/ics08-wasm/types/Cargo.toml +++ b/ibc-clients/ics08-wasm/types/Cargo.toml @@ -30,7 +30,7 @@ ibc-proto = { workspace = true } [dev-dependencies] rstest = { workspace = true } -serde_json = { workspace = true } +serde-json = { workspace = true } [features] default = [ "std" ] diff --git a/ibc-core/ics24-host/types/Cargo.toml b/ibc-core/ics24-host/types/Cargo.toml index 80c1efb2b..7ad95dcc0 100644 --- a/ibc-core/ics24-host/types/Cargo.toml +++ b/ibc-core/ics24-host/types/Cargo.toml @@ -35,7 +35,7 @@ scale-info = { workspace = true, optional = true } [dev-dependencies] rstest = { workspace = true } -serde_json = { workspace = true } +serde-json = { workspace = true } [features] default = [ "std" ] diff --git a/ibc-testkit/Cargo.toml b/ibc-testkit/Cargo.toml index 1ce60b37c..51b208c91 100644 --- a/ibc-testkit/Cargo.toml +++ b/ibc-testkit/Cargo.toml @@ -23,7 +23,7 @@ displaydoc = { workspace = true } parking_lot = { version = "0.12.1", default-features = false } schemars = { workspace = true, optional = true } serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } +serde-json = { workspace = true, optional = true } subtle-encoding = { workspace = true } typed-builder = { version = "0.18.0" } @@ -47,7 +47,7 @@ rstest = { workspace = true } default = [ "std" ] std = [ "serde/std", - "serde_json/std", + "serde-json/std", "ibc/std", "ibc-proto/std", "tendermint/std", @@ -56,7 +56,7 @@ serde = [ "dep:serde", "ibc/serde", "ibc-proto/serde", - "serde_json", + "dep:serde-json", ] schema = [ "dep:schemars", diff --git a/ibc-testkit/src/utils/mod.rs b/ibc-testkit/src/utils/mod.rs index 94163e32e..4ccd1f8ce 100644 --- a/ibc-testkit/src/utils/mod.rs +++ b/ibc-testkit/src/utils/mod.rs @@ -32,7 +32,8 @@ where let serialized = serde_json::to_string(&parsed0); assert!(serialized.is_ok()); let serialized = serialized.expect("should not fail"); - assert_eq!(serialized, json_data); + // We can't assert the following, as JSON string representation is not canonical. + // assert_eq!(serialized, json_data); let parsed1 = serde_json::from_str::(&serialized); assert!(parsed1.is_ok()); diff --git a/tests-integration/Cargo.toml b/tests-integration/Cargo.toml index 26877042b..766ee9d59 100644 --- a/tests-integration/Cargo.toml +++ b/tests-integration/Cargo.toml @@ -13,7 +13,7 @@ description = "Integration tests using `ibc-testkit` and the other IBC crates." [dependencies] # external dependencies serde = { workspace = true, optional = true } -serde_json = { workspace = true, optional = true } +serde-json = { workspace = true, optional = true } subtle-encoding = { workspace = true } tracing = { version = "0.1.40", default-features = false } @@ -36,7 +36,7 @@ basecoin-store = { version = "0.1.0" } tendermint = { workspace = true } tendermint-testgen = { workspace = true } -[dev_dependencies] +[dev-dependencies] cosmwasm-std = { workspace = true } hex = { version = "0.4.2" } rstest = { workspace = true } @@ -47,11 +47,9 @@ tendermint-rpc = { workspace = true } default = [ "std" ] std = [ "serde/std", - "serde_json/std", + "serde-json/std", "ibc/std", "ibc/serde", "ibc-testkit/serde", "tendermint/std", - "dep:serde", - "dep:serde_json", ]