Move Pair struct next to its implementations

Author: c410-f3r

core/primitives/src/ed25519.rs

@@ -45,21 +45,6 @@ type Seed = [u8; 32];
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default)]
 pub struct Public(pub [u8; 32]);
 
-/// A key pair.
-#[cfg(feature = "std")]
-pub struct Pair(ed25519_dalek::Keypair);
-
-#[cfg(feature = "std")]
-impl Clone for Pair {
-	fn clone(&self) -> Self {
-		Pair(ed25519_dalek::Keypair {
-			public: self.0.public.clone(),
-			secret: ed25519_dalek::SecretKey::from_bytes(self.0.secret.as_bytes())
-				.expect("key is always the correct size; qed")
-		})
-	}
-}
-
 impl AsRef<[u8; 32]> for Public {
 	fn as_ref(&self) -> &[u8; 32] {
 		&self.0
@@ -353,6 +338,21 @@ pub enum DeriveError {
 	SoftKeyInPath,
 }
 
+/// A key pair.
+#[cfg(feature = "std")]
+pub struct Pair(ed25519_dalek::Keypair);
+
+#[cfg(feature = "std")]
+impl Clone for Pair {
+	fn clone(&self) -> Self {
+		Pair(ed25519_dalek::Keypair {
+			public: self.0.public.clone(),
+			secret: ed25519_dalek::SecretKey::from_bytes(self.0.secret.as_bytes())
+				.expect("key is always the correct size; qed")
+		})
+	}
+}
+
 #[cfg(feature = "std")]
 impl TraitPair for Pair {
 	type Public = Public;

core/primitives/src/sr25519.rs

@@ -51,21 +51,6 @@ const SIGNING_CTX: &[u8] = b"substrate";
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Decode, Default)]
 pub struct Public(pub [u8; 32]);
 
-/// An Schnorrkel/Ristretto x25519 ("sr25519") key pair.
-#[cfg(feature = "std")]
-pub struct Pair(Keypair);
-
-#[cfg(feature = "std")]
-impl Clone for Pair {
-	fn clone(&self) -> Self {
-		Pair(schnorrkel::Keypair {
-			public: self.0.public,
-			secret: schnorrkel::SecretKey::from_bytes(&self.0.secret.to_bytes()[..])
-				.expect("key is always the correct size; qed")
-		})
-	}
-}
-
 impl AsRef<[u8; 32]> for Public {
 	fn as_ref(&self) -> &[u8; 32] {
 		&self.0
@@ -348,6 +333,21 @@ impl TraitPublic for Public {
 	}
 }
 
+/// An Schnorrkel/Ristretto x25519 ("sr25519") key pair.
+#[cfg(feature = "std")]
+pub struct Pair(Keypair);
+
+#[cfg(feature = "std")]
+impl Clone for Pair {
+	fn clone(&self) -> Self {
+		Pair(schnorrkel::Keypair {
+			public: self.0.public,
+			secret: schnorrkel::SecretKey::from_bytes(&self.0.secret.to_bytes()[..])
+				.expect("key is always the correct size; qed")
+		})
+	}
+}
+
 #[cfg(feature = "std")]
 impl From<MiniSecretKey> for Pair {
 	fn from(sec: MiniSecretKey) -> Pair {