fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-30 02:01:35 +00:00
Code Issues Projects Releases Wiki Activity

Revert "remove rustc-serialize (#359) (#386)" (#466)

Browse Source 
This reverts commit 73996885cb.
This commit is contained in:
Pierre Krieger
2018-09-07 14:05:42 +02:00
committed by GitHub
parent e45dce2d9a
commit 0a3d4cdfad
9 changed files with 50 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/secio/src/error.rs
View File

@ -20,7 +20,7 @@
//! Defines the `SecioError` enum that groups all possible errors in SECIO.
use aes_ctr::stream_cipher::LoopError;
use crypto::symmetriccipher::SymmetricCipherError;
use std::error;
use std::fmt;
use std::io::Error as IoError;
@ -55,8 +55,8 @@ pub enum SecioError {
/// The final check of the handshake failed.
NonceVerificationFailed,
/// Error with block cipher.
CipherError(LoopError),
/// Error while decoding/encoding data.
CipherError(SymmetricCipherError),
/// The received frame was of invalid length.
FrameTooShort,
@ -111,9 +111,9 @@ impl fmt::Display for SecioError {
}
}
impl From<LoopError> for SecioError {
impl From<SymmetricCipherError> for SecioError {
#[inline]
fn from(err: LoopError) -> SecioError {
fn from(err: SymmetricCipherError) -> SecioError {
SecioError::CipherError(err)
}
}