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

Commit

Permalink
Implement Copy and Deref to (ed25519|sr25519)::Public
Browse files Browse the repository at this point in the history
  • Loading branch information
c410-f3r committed Nov 1, 2019
1 parent d8a3640 commit 03f744d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
11 changes: 10 additions & 1 deletion core/primitives/src/ed25519.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::crypto::{Pair as TraitPair, DeriveJunction, SecretStringError, Ss58Co
#[cfg(feature = "std")]
use serde::{de, Serializer, Serialize, Deserializer, Deserialize};
use crate::{crypto::{Public as TraitPublic, UncheckedFrom, CryptoType, Derive}};
use core::ops::Deref;

/// A secret seed. It's not called a "secret key" because ring doesn't expose the secret keys
/// of the key pair (yeah, dumb); as such we're forced to remember the seed manually if we
Expand All @@ -42,7 +43,7 @@ type Seed = [u8; 32];

/// A public key.
#[cfg_attr(feature = "std", derive(Hash))]
#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default)]
#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default)]
pub struct Public(pub [u8; 32]);

impl AsRef<[u8; 32]> for Public {
Expand All @@ -63,6 +64,14 @@ impl AsMut<[u8]> for Public {
}
}

impl Deref for Public {
type Target = [u8];

fn deref(&self) -> &Self::Target {
&self.0
}
}

impl rstd::convert::TryFrom<&[u8]> for Public {
type Error = ();

Expand Down
11 changes: 10 additions & 1 deletion core/primitives/src/sr25519.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use crate::crypto::{
use crate::{crypto::{Public as TraitPublic, UncheckedFrom, CryptoType, Derive}};
use crate::hash::{H256, H512};
use codec::{Encode, Decode};
use core::ops::Deref;

#[cfg(feature = "std")]
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
Expand All @@ -48,7 +49,7 @@ const SIGNING_CTX: &[u8] = b"substrate";

/// An Schnorrkel/Ristretto x25519 ("sr25519") public key.
#[cfg_attr(feature = "std", derive(Hash))]
#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default)]
#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Default)]
pub struct Public(pub [u8; 32]);

impl AsRef<[u8; 32]> for Public {
Expand All @@ -69,6 +70,14 @@ impl AsMut<[u8]> for Public {
}
}

impl Deref for Public {
type Target = [u8];

fn deref(&self) -> &Self::Target {
&self.0
}
}

impl From<Public> for [u8; 32] {
fn from(x: Public) -> [u8; 32] {
x.0
Expand Down

0 comments on commit 03f744d

Please sign in to comment.