fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-24 15:21:33 +00:00
Code Issues Projects Releases Wiki Activity

Update some dependenices; Remove some useless dependencies (#1387)

Browse Source 
Signed-off-by: koushiro <koushiro.cqx@gmail.com>

Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
This commit is contained in:
Qinxuan Chen
2020-01-10 21:03:59 +08:00
committed by Pierre Krieger
parent 655609dfe0
commit af464e18c5
18 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/identity/ed25519.rs
View File

@ -21,7 +21,6 @@
//! Ed25519 keys.
use ed25519_dalek as ed25519;
use failure::Fail;
use rand::RngCore;
use super::error::DecodingError;
use zeroize::Zeroize;
@ -48,7 +47,7 @@ impl Keypair {
pub fn decode(kp: &mut [u8]) -> Result<Keypair, DecodingError> {
ed25519::Keypair::from_bytes(kp)
.map(|k| { kp.zeroize(); Keypair(k) })
.map_err(|e| DecodingError::new("Ed25519 keypair").source(e.compat()))
.map_err(|e| DecodingError::new("Ed25519 keypair").source(e))
}
/// Sign a message using the private key of this keypair.
@ -120,7 +119,7 @@ impl PublicKey {
/// Decode a public key from a byte array as produced by `encode`.
pub fn decode(k: &[u8]) -> Result<PublicKey, DecodingError> {
ed25519::PublicKey::from_bytes(k)
.map_err(|e| DecodingError::new("Ed25519 public key").source(e.compat()))
.map_err(|e| DecodingError::new("Ed25519 public key").source(e))
.map(PublicKey)
}
}
@ -164,7 +163,7 @@ impl SecretKey {
pub fn from_bytes(mut sk_bytes: impl AsMut<[u8]>) -> Result<SecretKey, DecodingError> {
let sk_bytes = sk_bytes.as_mut();
let secret = ed25519::SecretKey::from_bytes(&*sk_bytes)
.map_err(|e| DecodingError::new("Ed25519 secret key").source(e.compat()))?;
.map_err(|e| DecodingError::new("Ed25519 secret key").source(e))?;
sk_bytes.zeroize();
Ok(SecretKey(secret))
}

20
core/src/peer_id.rs
View File

@ -20,7 +20,7 @@
use crate::PublicKey;
use bs58;
use quick_error::quick_error;
use thiserror::Error;
use multihash;
use std::{convert::TryFrom, fmt, str::FromStr};
@ -218,18 +218,12 @@ impl Into<multihash::Multihash> for PeerId {
}
}
quick_error! {
#[derive(Debug)]
pub enum ParseError {
B58(e: bs58::decode::Error) {
display("base-58 decode error: {}", e)
cause(e)
from()
}
MultiHash {
display("decoding multihash failed")
}
}
#[derive(Debug, Error)]
pub enum ParseError {
#[error("base-58 decode error: {0}")]
B58(#[from] bs58::decode::Error),
#[error("decoding multihash failed")]
MultiHash,
}
impl FromStr for PeerId {