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

Fix compilation problems due to ed25519-dalek 1.0.0-pre.4 #6676

Merged
4 commits merged into from
Jul 20, 2020
Merged

Fix compilation problems due to ed25519-dalek 1.0.0-pre.4 #6676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d054ef
Fix compilation problems due to ed25519-dalek 1.0.0-pre.4
tomaka Jul 17, 2020
6486065
Update libp2p-core
tomaka Jul 17, 2020
ffad673
Revert rand downgrade
tomaka Jul 17, 2020
0eca759
Merge remote-tracking branch 'upstream/master' into fix-ed25519-dalek
tomaka Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion primitives/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ parity-util-mem = { version = "0.7.0", default-features = false, features = ["pr
futures = { version = "0.3.1", optional = true }

# full crypto
ed25519-dalek = { version = "1.0.0-pre.3", default-features = false, features = ["u64_backend", "alloc"], optional = true }
ed25519-dalek = { version = "1.0.0-pre.4", default-features = false, features = ["u64_backend", "alloc"], optional = true }
blake2-rfc = { version = "0.2.18", default-features = false, optional = true }
tiny-keccak = { version = "2.0.1", features = ["keccak"], optional = true }
schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false, optional = true }
Expand Down
4 changes: 3 additions & 1 deletion primitives/core/src/ed25519.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ use codec::{Encode, Decode};
use blake2_rfc;
#[cfg(feature = "full_crypto")]
use core::convert::TryFrom;
#[cfg(feature = "full_crypto")]
use ed25519_dalek::{Signer as _, Verifier as _};
#[cfg(feature = "std")]
use substrate_bip39::seed_from_entropy;
#[cfg(feature = "std")]
Expand Down Expand Up @@ -513,7 +515,7 @@ impl TraitPair for Pair {
Err(_) => return false,
};

let sig = match ed25519_dalek::Signature::from_bytes(sig) {
let sig = match ed25519_dalek::Signature::try_from(sig) {
Ok(s) => s,
Err(_) => return false
};
Expand Down