diff --git a/crypto/keys/ed25519.rs b/crypto/keys/ed25519.rs index 2ed603663b048770633b8277ba1749993c151705..f239e51bd823f66f7c4ed1e235b8faaf9de88b9a 100644 --- a/crypto/keys/ed25519.rs +++ b/crypto/keys/ed25519.rs @@ -19,6 +19,8 @@ //! //! [`KeyPairGenerator`]: struct.KeyPairGenerator.html +extern crate serde; + use std::collections::hash_map::DefaultHasher; use std::fmt::Display; use std::fmt::Error; @@ -30,6 +32,7 @@ use base58::{FromBase58, FromBase58Error, ToBase58}; use base64; use base64::DecodeError; use crypto; +use self::serde::ser::{Serialize, Serializer}; use super::{BaseConvertionError, PrivateKey as PrivateKeyMethods, PublicKey as PublicKeyMethods}; @@ -123,6 +126,15 @@ impl Debug for PublicKey { } } +impl Serialize for PublicKey { + fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> + where + S: Serializer, + { + serializer.serialize_str(&format!("{}", self)) + } +} + impl super::PublicKey for PublicKey { type Signature = Signature; diff --git a/documents/blockchain/v10/documents/certification.rs b/documents/blockchain/v10/documents/certification.rs index 6c0e3c0fe15c35011ef15bbebfe223464ae5f551..cc841f9de5d7a31a4abace5f242e4d7f8bd5c111 100644 --- a/documents/blockchain/v10/documents/certification.rs +++ b/documents/blockchain/v10/documents/certification.rs @@ -15,8 +15,11 @@ //! Wrappers around Certification documents. +extern crate serde; + use duniter_crypto::keys::{PublicKey, Signature, ed25519}; use regex::Regex; +use self::serde::ser::{Serialize, Serializer}; use Blockstamp; use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument}; @@ -120,6 +123,15 @@ impl TextDocument for CertificationDocument { } } +impl Serialize for CertificationDocument { + fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> + where + S: Serializer, + { + serializer.serialize_str(&self.generate_compact_text()) + } +} + impl IntoSpecializedDocument<BlockchainProtocol> for CertificationDocument { fn into_specialized(self) -> BlockchainProtocol { BlockchainProtocol::V10(Box::new(V10Document::Certification(Box::new(self)))) diff --git a/documents/blockchain/v10/documents/identity.rs b/documents/blockchain/v10/documents/identity.rs index cf40450c53ea1e4971b4c8448f06b62349179892..ed9de1608edb6fd2085c3329e44652c0da28bca6 100644 --- a/documents/blockchain/v10/documents/identity.rs +++ b/documents/blockchain/v10/documents/identity.rs @@ -15,8 +15,11 @@ //! Wrappers around Identity documents. +extern crate serde; + use duniter_crypto::keys::{PublicKey, ed25519}; use regex::Regex; +use self::serde::ser::{Serialize, Serializer}; use Blockstamp; use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument}; @@ -100,6 +103,15 @@ impl TextDocument for IdentityDocument { } } +impl Serialize for IdentityDocument { + fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> + where + S: Serializer, + { + serializer.serialize_str(&self.generate_compact_text()) + } +} + impl IntoSpecializedDocument<BlockchainProtocol> for IdentityDocument { fn into_specialized(self) -> BlockchainProtocol { BlockchainProtocol::V10(Box::new(V10Document::Identity(self))) diff --git a/documents/blockchain/v10/documents/membership.rs b/documents/blockchain/v10/documents/membership.rs index b8e5652b45ea912cb35af050a0f8742629bdd677..061dc808025602bc56e5fa995008f7608caa9bed 100644 --- a/documents/blockchain/v10/documents/membership.rs +++ b/documents/blockchain/v10/documents/membership.rs @@ -15,8 +15,11 @@ //! Wrappers around Membership documents. +extern crate serde; + use duniter_crypto::keys::{PublicKey, ed25519}; use regex::Regex; +use self::serde::ser::{Serialize, Serializer}; use Blockstamp; use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument}; @@ -122,6 +125,15 @@ impl TextDocument for MembershipDocument { } } +impl Serialize for MembershipDocument { + fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> + where + S: Serializer, + { + serializer.serialize_str(&self.generate_compact_text()) + } +} + impl IntoSpecializedDocument<BlockchainProtocol> for MembershipDocument { fn into_specialized(self) -> BlockchainProtocol { BlockchainProtocol::V10(Box::new(V10Document::Membership(self))) diff --git a/documents/blockchain/v10/documents/revocation.rs b/documents/blockchain/v10/documents/revocation.rs index 43b58913a7d9698f0be6f3a6806ee03a1b0e48c8..4ba5f7773abd5d6f46612dd9adc31113357fabe9 100644 --- a/documents/blockchain/v10/documents/revocation.rs +++ b/documents/blockchain/v10/documents/revocation.rs @@ -15,8 +15,11 @@ //! Wrappers around Revocation documents. +extern crate serde; + use duniter_crypto::keys::{PublicKey, Signature, ed25519}; use regex::Regex; +use self::serde::ser::{Serialize, Serializer}; use Blockstamp; use blockchain::{BlockchainProtocol, Document, DocumentBuilder, IntoSpecializedDocument}; @@ -102,6 +105,15 @@ impl TextDocument for RevocationDocument { } } +impl Serialize for RevocationDocument { + fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> + where + S: Serializer, + { + serializer.serialize_str(&self.generate_compact_text()) + } +} + impl IntoSpecializedDocument<BlockchainProtocol> for RevocationDocument { fn into_specialized(self) -> BlockchainProtocol { BlockchainProtocol::V10(Box::new(V10Document::Revocation(Box::new(self)))) diff --git a/documents/lib.rs b/documents/lib.rs index 702879a4d0b2915cc92bb87e4f198531e7e34ebf..f89b5accf124c8bc94f452cbc86c55039781a4e9 100644 --- a/documents/lib.rs +++ b/documents/lib.rs @@ -118,7 +118,7 @@ impl Hash { /// Wrapper of a block hash. #[derive(Copy, Clone, PartialEq, Eq, Hash)] -pub struct BlockHash(Hash); +pub struct BlockHash(pub Hash); impl Display for BlockHash { fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {