From b86b821c395c5ea98bdc8ba1de11dd71b126e5e4 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 13:46:48 +0100 Subject: [PATCH 1/7] ethbloom: do not pull std for 'serialize' feature --- ethbloom/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethbloom/Cargo.toml b/ethbloom/Cargo.toml index c4a4600c9..88777f43b 100644 --- a/ethbloom/Cargo.toml +++ b/ethbloom/Cargo.toml @@ -25,7 +25,7 @@ hex-literal = "0.3.1" [features] default = ["std", "rlp", "serialize", "rustc-hex"] std = ["fixed-hash/std", "crunchy/std"] -serialize = ["std", "impl-serde"] +serialize = ["impl-serde"] rustc-hex = ["fixed-hash/rustc-hex"] arbitrary = ["fixed-hash/arbitrary"] rlp = ["impl-rlp"] From adc8f8a28a7d2ccfd453d315f63ed2db34ef4a8c Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 13:47:27 +0100 Subject: [PATCH 2/7] ethereum-types: do not pull std for 'serialize' feature --- ethereum-types/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum-types/Cargo.toml b/ethereum-types/Cargo.toml index 1f9ad0d00..c7eb4b449 100644 --- a/ethereum-types/Cargo.toml +++ b/ethereum-types/Cargo.toml @@ -22,7 +22,7 @@ serde_json = "1.0.41" [features] default = ["std", "rlp", "serialize"] std = ["uint-crate/std", "fixed-hash/std", "ethbloom/std", "primitive-types/std"] -serialize = ["std", "impl-serde", "primitive-types/serde", "ethbloom/serialize"] +serialize = ["impl-serde", "primitive-types/serde_no_std", "ethbloom/serialize"] arbitrary = ["ethbloom/arbitrary", "fixed-hash/arbitrary", "uint-crate/arbitrary"] rlp = ["impl-rlp", "ethbloom/rlp", "primitive-types/rlp"] codec = ["impl-codec", "ethbloom/codec"] From b5bc32c4203063a02ce0cbc954159fa9785f2386 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 13:56:07 +0100 Subject: [PATCH 3/7] CI: check wasm builds for ethbloom and ethereum-types --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5950b71dc..c8e222872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ matrix: rust: stable install: - cargo install cross + - rustup target add wasm64-unknown-unknown script: - cross test --target=aarch64-linux-android -p parity-util-mem - os: osx @@ -42,6 +43,8 @@ script: cd contract-address/ && cargo test --features=external_doc && cd ..; fi - cd ethbloom/ && cargo test --no-default-features --features="rustc-hex" && cargo check --benches && cd .. + - cd ethbloom/ && cargo build --no-default-features --features="serialize,rlp,codec" --target=wasm32-unknown-unknown && cd .. + - cd ethereum-types/ && cargo build --no-default-features --features="serialize,rlp" --target=wasm32-unknown-unknown && cd .. - cd fixed-hash/ && cargo test --all-features && cargo test --no-default-features --features="byteorder,rustc-hex" && cd .. - cd uint/ && cargo test --all-features && cargo test --no-default-features && cd .. - cd keccak-hash/ && cargo test --no-default-features && cd .. From 30c3c3d223298d6d2af16c8a95a018b85c0a0f93 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 14:08:26 +0100 Subject: [PATCH 4/7] fix wasm target --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c8e222872..094e0505a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: rust: stable install: - cargo install cross - - rustup target add wasm64-unknown-unknown + - rustup target add wasm32-unknown-unknown script: - cross test --target=aarch64-linux-android -p parity-util-mem - os: osx From 64557a7ae7670b91d2bf860d0ae6eed97f4bf0f2 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 14:09:56 +0100 Subject: [PATCH 5/7] CI: remove redundant check --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 094e0505a..0b1befc12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ script: cd contract-address/ && cargo test --features=external_doc && cd ..; fi - cd ethbloom/ && cargo test --no-default-features --features="rustc-hex" && cargo check --benches && cd .. - - cd ethbloom/ && cargo build --no-default-features --features="serialize,rlp,codec" --target=wasm32-unknown-unknown && cd .. - cd ethereum-types/ && cargo build --no-default-features --features="serialize,rlp" --target=wasm32-unknown-unknown && cd .. - cd fixed-hash/ && cargo test --all-features && cargo test --no-default-features --features="byteorder,rustc-hex" && cd .. - cd uint/ && cargo test --all-features && cargo test --no-default-features && cd .. From 646342ad25966d5afcec58f5d55c57cc5e37ceeb Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 12 Jan 2021 15:12:42 +0100 Subject: [PATCH 6/7] CI: fix wasm target install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b1befc12..c1b606155 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ matrix: rust: stable install: - cargo install cross - - rustup target add wasm32-unknown-unknown script: - cross test --target=aarch64-linux-android -p parity-util-mem - os: osx @@ -27,6 +26,7 @@ matrix: allow_failures: - rust: nightly install: + - rustup target add wasm32-unknown-unknown - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | sh - source ~/.nvm/nvm.sh - nvm install --lts From 3b8dcb5bb3ed80e6ef0ac61b849dae4e56514685 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 20 Jan 2021 11:13:17 +0100 Subject: [PATCH 7/7] update changelogs --- ethbloom/CHANGELOG.md | 2 ++ ethereum-types/CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ethbloom/CHANGELOG.md b/ethbloom/CHANGELOG.md index 14cb8a7cb..94a75dcb1 100644 --- a/ethbloom/CHANGELOG.md +++ b/ethbloom/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Potentially-breaking +- `serialize` feature no longer pulls `std`. [#503](https://github.com/paritytech/parity-common/pull/503) ## [0.10.0] - 2021-01-05 ### Breaking diff --git a/ethereum-types/CHANGELOG.md b/ethereum-types/CHANGELOG.md index 86d01c3de..e2b349a50 100644 --- a/ethereum-types/CHANGELOG.md +++ b/ethereum-types/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog]. [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Potentially-breaking +- `serialize` feature no longer pulls `std`. [#503](https://github.com/paritytech/parity-common/pull/503) ## [0.10.0] - 2021-01-05 ### Breaking