Skip to content
Permalink
Browse files

Updated cardano-deps to master

Adapted to rust-crypto trait changes, but the
network changes are left dangling for this commit.
  • Loading branch information...
mzabaluev committed May 14, 2019
1 parent ee38b87 commit ea032924bc0a0f20f270afc41dcc32e4b48a2f80
Showing with 19 additions and 5 deletions.
  1. +14 −0 Cargo.lock
  2. +1 −1 cardano-deps
  3. +4 −4 utils/src/serde.rs

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -6,7 +6,7 @@ use chain_crypto::{bech32::Bech32, Ed25519Extended, PublicKey};
use chain_impl_mockchain::leadership::bft::LeaderId;
use serde::{
de::{Deserializer, Error as DeserializerError, Visitor},
ser::{Error as _, Serializer},
ser::Serializer,
Deserialize, Serialize,
};
use std::fmt::{self, Display};
@@ -130,12 +130,12 @@ pub mod witness {
pub mod crypto {
use super::*;
use ::bech32::{Bech32 as Bech32Data, FromBase32 as _};
use chain_crypto::{AsymmetricKey, Blake2b256, PublicKey, SecretKey};
use chain_crypto::{AsymmetricKey, Blake2b256, PublicKey, SecretKey, SecretKeySizeStatic};

pub fn deserialize_secret<'de, D, A>(deserializer: D) -> Result<SecretKey<A>, D::Error>
where
D: Deserializer<'de>,
A: AsymmetricKey,
A: SecretKeySizeStatic,
{
let secret_key_visitor = SecretKeyVisitor::new();
if deserializer.is_human_readable() {
@@ -244,7 +244,7 @@ pub mod crypto {

impl<'de, A> Visitor<'de> for SecretKeyVisitor<A>
where
A: AsymmetricKey,
A: SecretKeySizeStatic,
{
type Value = SecretKey<A>;

0 comments on commit ea03292

Please sign in to comment.
You can’t perform that action at this time.