Resolve accidental KeyPair merge conflict

This commit is contained in:
Michael Sproul
2019-11-11 17:19:30 +11:00
parent d0249a5518
commit 2651255a89

View File

@@ -3,7 +3,7 @@ use serde_derive::{Deserialize, Serialize};
use std::fmt; use std::fmt;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
#[derive(Debug, Clone, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct Keypair { pub struct Keypair {
pub sk: SecretKey, pub sk: SecretKey,
pub pk: PublicKey, pub pk: PublicKey,
@@ -22,12 +22,7 @@ impl Keypair {
} }
} }
impl PartialEq for Keypair { #[allow(clippy::derive_hash_xor_eq)]
fn eq(&self, other: &Keypair) -> bool {
self == other
}
}
impl Hash for Keypair { impl Hash for Keypair {
/// Note: this is distinct from consensus serialization, it will produce a different hash. /// Note: this is distinct from consensus serialization, it will produce a different hash.
/// ///