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

Cargo.lock: Update to async-tls 0.10.2 #2096

Merged
3 commits merged into from
Dec 9, 2020
Merged

Cargo.lock: Update to async-tls 0.10.2 #2096

3 commits merged into from
Dec 9, 2020

Conversation

mxinden
Copy link
Contributor

@mxinden mxinden commented Dec 9, 2020

Companion pull request for paritytech/substrate#7696.

async-tls needs to be updated manually as the recent patch release v0.10.2 contains breaking changes. See async-rs/async-tls#42.

@mxinden mxinden added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Dec 9, 2020
@mxinden mxinden mentioned this pull request Dec 9, 2020
Merged
@ordian
Copy link
Member

ordian commented Dec 9, 2020

doesn't compile due to two versions of rustls (but previously we had multiple versions of webpki-roots 🙂 )

@mxinden
Copy link
Contributor Author

mxinden commented Dec 9, 2020

doesn't compile due to two versions of rustls (but previously we had multiple versions of webpki-roots slightly_smiling_face )

As far as I can tell the failure would be resolved once build with paritytech/substrate#7696. As far as I can tell the recent CI run was build with master. @ordian am I missing something?

@ordian
Copy link
Member

ordian commented Dec 9, 2020

doesn't compile due to two versions of rustls (but previously we had multiple versions of webpki-roots slightly_smiling_face )

As far as I can tell the failure would be resolved once build with paritytech/substrate#7696. As far as I can tell the recent CI run was build with master. @ordian am I missing something?

Ah, right, then it's fine as long as it compiles with your branch.

@ghost
Copy link

ghost commented Dec 9, 2020

Waiting for commit status.

@ordian
Copy link
Member

ordian commented Dec 9, 2020

Looks like sc-offchain depends on hyper-rustls 0.21.0 (the latest published version ATM). which depends on rustls 0.18.
But it seems to compile with multiple version of it just fine.

@ghost ghost merged commit b12325b into master Dec 9, 2020
@ghost ghost deleted the mxinden-libp2p-v0.32.0 branch December 9, 2020 22:23
@mxinden
Copy link
Contributor Author

mxinden commented Dec 9, 2020

But it seems to compile with multiple version of it just fine.

Yes. I am assuming that libp2p-websocket with rustls v0.19.0 does not conflict with sc-offchain with rustls v0.18.0.

hyper-rustls updated to rustls v0.19.0 with rustls/hyper-rustls@cbfc996 on master. Once that is released and Polkadot updated we should be back to a single version.

Thank you for the help @ordian!

drahnr pushed a commit that referenced this pull request Dec 10, 2020
@mxinden @drahnr
Cargo.lock: Update to async-tls 0.10.2 (#2096)
797a90f 
* Cargo.lock: Update to async-tls 0.10.2

* "Update Substrate"

Co-authored-by: parity-processbot <>
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ordian ordian ordian approved these changes

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mxinden @ordian