Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Upgrade dependencies whenever “easy” #3556

Merged
merged 43 commits into from
Oct 2, 2019

Conversation

Demi-Marie
Copy link
Contributor

@Demi-Marie Demi-Marie commented Sep 5, 2019

“easy” means that there are no major changes required.

Fixes #3685

@bkchr
Copy link
Member

bkchr commented Sep 5, 2019

Does this supersedes: #3532 ?

@Demi-Marie
Copy link
Contributor Author

Does this supersedes: #3532 ?

@bkchr It builds on top of #3532.

@bkchr
Copy link
Member

bkchr commented Sep 5, 2019

It is not even building and when it includes the other pr, it supersedes it.

@bkchr
Copy link
Member

bkchr commented Sep 5, 2019

Please fix the build.

Copy link
Contributor

@gui1117 gui1117 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as a note the following crates has been updated in there major release:
rpassword
futures-timer
rand
futures-preview
parity-wasm
ed25519-dalek
zeroize

core/executor/Cargo.toml Outdated Show resolved Hide resolved
core/primitives/Cargo.toml Outdated Show resolved Hide resolved
core/sr-primitives/Cargo.toml Outdated Show resolved Hide resolved
core/sr-sandbox/Cargo.toml Outdated Show resolved Hide resolved
core/sr-version/src/lib.rs Outdated Show resolved Hide resolved
core/test-client/Cargo.toml Outdated Show resolved Hide resolved
node/cli/Cargo.toml Outdated Show resolved Hide resolved
srml/contracts/Cargo.toml Outdated Show resolved Hide resolved
srml/contracts/Cargo.toml Outdated Show resolved Hide resolved
as updated versions have been published to crates.io
Otherwise, rustc complains (correctly) about duplicate lang items.
Rust does not allow duplicate lang items.  When compiled without the
`std` feature, `sr-io` defines two lang items.  Therefore, `sr-io`
compiled without `feature = "std"` must not be linked with `std`.

However, `pwasm-utils` and `wasmi-validation` both bring in `std` unless
compiled with `default-features = "false"`.  This caused a duplicate
lang item error.  Building both with `default-features = "false"`
prevents this error.  When building with `feature = "std"`, they should
both be built with the `std` feature, so this feature needs to be
explicitly depended on.
Three tests used 1 less gas than they had previously.
@Demi-Marie
Copy link
Contributor Author

This is ready to be merged.

core/sr-io/Cargo.toml Outdated Show resolved Hide resolved
@@ -458,7 +458,7 @@ impl TraitPair for Pair {
Err(_) => return false
};

match public_key.verify(message.as_ref(), &sig) {
match public_key.verify::<sha2::Sha512>(message.as_ref(), &sig) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you elaborate on those? Are these changes equivalent?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomaka, can you please confirm this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to check it myself and it seems that it should be fine. However, I am not 100%.

Copy link
Member

@bkchr bkchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just some last nitpicks

core/authority-discovery/Cargo.toml Outdated Show resolved Hide resolved
core/executor/Cargo.toml Outdated Show resolved Hide resolved
core/executor/Cargo.toml Outdated Show resolved Hide resolved
core/executor/Cargo.toml Outdated Show resolved Hide resolved
core/executor/runtime-test/Cargo.toml Outdated Show resolved Hide resolved
core/sr-api-macros/Cargo.toml Outdated Show resolved Hide resolved
core/sr-api-macros/Cargo.toml Outdated Show resolved Hide resolved
core/sr-api-macros/Cargo.toml Outdated Show resolved Hide resolved
core/sr-api-macros/Cargo.toml Outdated Show resolved Hide resolved
core/sr-version/src/lib.rs Outdated Show resolved Hide resolved
Demi-Marie and others added 5 commits October 2, 2019 14:34
Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>
Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>
Co-Authored-By: Sergei Pepyakin <sergei@parity.io>
@Demi-Marie Demi-Marie merged commit 0cfe743 into master Oct 2, 2019
@Demi-Marie Demi-Marie deleted the demi/upgrade-compatible-deps branch October 2, 2019 19:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Updating hyper to 0.12.35 breaks the api::http::tests::request_write_body_invalid_call test
6 participants