Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion rust/tw_keypair/src/ed25519/keypair.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use tw_encoding::hex;
use zeroize::Zeroizing;

/// Represents a pair of `ed25519` private and public keys.
#[derive(Debug)]
pub struct KeyPair<H: Hasher512> {
private: PrivateKey<H>,
public: PublicKey<H>,
Expand Down
22 changes: 4 additions & 18 deletions rust/tw_keypair/src/ed25519/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl<T> Hasher512 for T where T: Digest<OutputSize = U64> {}
#[cfg(test)]
mod tests {
use super::*;
use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
use crate::traits::{SigningKeyTrait, VerifyingKeyTrait};
use tw_encoding::hex;
use tw_hash::sha2::sha256;
use tw_hash::sha3::keccak256;
Expand Down Expand Up @@ -242,22 +242,8 @@ mod tests {
#[test]
fn test_keypair_from_invalid_bytes() {
let invalid = [0; 1];
let _ = sha512::KeyPair::try_from(&invalid[..]).unwrap_err();
let _ = sha512::PrivateKey::try_from(&invalid[..]).unwrap_err();
let _ = sha512::PublicKey::try_from(&invalid[..]).unwrap_err();
}

#[test]
fn test_debug() {
let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
let sign = H512::from("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07e7ed7a20a4e2fa1009db3d1443e937e6abb16ff3c3eaecb798faed7fbb40b008");

let keypair = sha512::KeyPair::try_from(secret).unwrap();
let sign = Signature::try_from(sign.as_slice()).unwrap();

let _ = format!("{:?}", keypair);
let _ = format!("{:?}", keypair.private());
let _ = format!("{:?}", keypair.public());
let _ = format!("{:?}", sign);
assert!(sha512::KeyPair::try_from(&invalid[..]).is_err());
assert!(sha512::PrivateKey::try_from(&invalid[..]).is_err());
assert!(sha512::PublicKey::try_from(&invalid[..]).is_err());
}
}
9 changes: 0 additions & 9 deletions rust/tw_keypair/src/ed25519/private.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use crate::ed25519::signature::Signature;
use crate::ed25519::Hasher512;
use crate::traits::SigningKeyTrait;
use crate::{KeyPairError, KeyPairResult};
use std::fmt;
use tw_encoding::hex;
use tw_hash::H256;
use tw_misc::traits::ToBytesZeroizing;
Expand All @@ -23,14 +22,6 @@ pub struct PrivateKey<H: Hasher512> {
expanded_key: ExpandedSecretKey<H>,
}

impl<H: Hasher512> fmt::Debug for PrivateKey<H> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("PrivateKey")
.field("secret", &self.secret)
.finish()
}
}

impl<H: Hasher512> PrivateKey<H> {
/// Returns an associated `ed25519` public key.
pub fn public(&self) -> PublicKey<H> {
Expand Down
Loading