From b16396b9b30d54519e3edca14f6b93529a669466 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Thu, 25 Nov 2021 11:17:23 +0100
Subject: [PATCH] Rename internal keypair locations (#1242)

* Rename internal keypair locations

* save all :)

* Incdicate testing

* add dummy test
---
 packages/util-crypto/src/ed25519/index.ts                 | 8 ++++----
 .../src/ed25519/{keypair => pair}/fromRandom.spec.ts      | 0
 .../src/ed25519/{keypair => pair}/fromRandom.ts           | 0
 .../src/ed25519/{keypair => pair}/fromSecret.spec.ts      | 0
 .../src/ed25519/{keypair => pair}/fromSecret.ts           | 0
 .../src/ed25519/{keypair => pair}/fromSeed.spec.ts        | 0
 .../util-crypto/src/ed25519/{keypair => pair}/fromSeed.ts | 0
 .../src/ed25519/{keypair => pair}/fromString.spec.ts      | 0
 .../src/ed25519/{keypair => pair}/fromString.ts           | 0
 packages/util-crypto/src/key/hdkdEcdsa.ts                 | 2 +-
 packages/util-crypto/src/mnemonic/toEntropy.spec.ts       | 2 +-
 packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts    | 2 +-
 packages/util-crypto/src/secp256k1/index.ts               | 2 +-
 .../src/secp256k1/{keypair => pair}/fromSeed.spec.ts      | 0
 .../src/secp256k1/{keypair => pair}/fromSeed.ts           | 0
 packages/util-crypto/src/sr25519/derive.ts                | 4 ++--
 packages/util-crypto/src/sr25519/index.ts                 | 2 +-
 .../src/sr25519/{keypair => pair}/fromSeed.spec.ts        | 2 +-
 .../util-crypto/src/sr25519/{keypair => pair}/fromSeed.ts | 0
 .../util-crypto/src/sr25519/{keypair => pair}/fromU8a.ts  | 0
 .../sr25519/{keypair/testing.ts => pair/testing.spec.ts}  | 4 ++++
 .../util-crypto/src/sr25519/{keypair => pair}/toU8a.ts    | 0
 packages/util-crypto/src/sr25519/signVerify.spec.ts       | 2 +-
 packages/util-crypto/src/sr25519/vrfSignVerify.spec.ts    | 2 +-
 24 files changed, 18 insertions(+), 14 deletions(-)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromRandom.spec.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromRandom.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromSecret.spec.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromSecret.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromSeed.spec.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromSeed.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromString.spec.ts (100%)
 rename packages/util-crypto/src/ed25519/{keypair => pair}/fromString.ts (100%)
 rename packages/util-crypto/src/secp256k1/{keypair => pair}/fromSeed.spec.ts (100%)
 rename packages/util-crypto/src/secp256k1/{keypair => pair}/fromSeed.ts (100%)
 rename packages/util-crypto/src/sr25519/{keypair => pair}/fromSeed.spec.ts (97%)
 rename packages/util-crypto/src/sr25519/{keypair => pair}/fromSeed.ts (100%)
 rename packages/util-crypto/src/sr25519/{keypair => pair}/fromU8a.ts (100%)
 rename packages/util-crypto/src/sr25519/{keypair/testing.ts => pair/testing.spec.ts} (99%)
 rename packages/util-crypto/src/sr25519/{keypair => pair}/toU8a.ts (100%)

diff --git a/packages/util-crypto/src/ed25519/index.ts b/packages/util-crypto/src/ed25519/index.ts
index 2c194690d..cec271464 100644
--- a/packages/util-crypto/src/ed25519/index.ts
+++ b/packages/util-crypto/src/ed25519/index.ts
@@ -6,9 +6,9 @@
  */
 export { convertPublicKeyToCurve25519, convertSecretKeyToCurve25519 } from './convertKey';
 export { ed25519DeriveHard } from './deriveHard';
-export { ed25519PairFromRandom } from './keypair/fromRandom';
-export { ed25519PairFromSecret } from './keypair/fromSecret';
-export { ed25519PairFromSeed } from './keypair/fromSeed';
-export { ed25519PairFromString } from './keypair/fromString';
+export { ed25519PairFromRandom } from './pair/fromRandom';
+export { ed25519PairFromSecret } from './pair/fromSecret';
+export { ed25519PairFromSeed } from './pair/fromSeed';
+export { ed25519PairFromString } from './pair/fromString';
 export { ed25519Sign } from './sign';
 export { ed25519Verify } from './verify';
diff --git a/packages/util-crypto/src/ed25519/keypair/fromRandom.spec.ts b/packages/util-crypto/src/ed25519/pair/fromRandom.spec.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromRandom.spec.ts
rename to packages/util-crypto/src/ed25519/pair/fromRandom.spec.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromRandom.ts b/packages/util-crypto/src/ed25519/pair/fromRandom.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromRandom.ts
rename to packages/util-crypto/src/ed25519/pair/fromRandom.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromSecret.spec.ts b/packages/util-crypto/src/ed25519/pair/fromSecret.spec.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromSecret.spec.ts
rename to packages/util-crypto/src/ed25519/pair/fromSecret.spec.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromSecret.ts b/packages/util-crypto/src/ed25519/pair/fromSecret.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromSecret.ts
rename to packages/util-crypto/src/ed25519/pair/fromSecret.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromSeed.spec.ts b/packages/util-crypto/src/ed25519/pair/fromSeed.spec.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromSeed.spec.ts
rename to packages/util-crypto/src/ed25519/pair/fromSeed.spec.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromSeed.ts b/packages/util-crypto/src/ed25519/pair/fromSeed.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromSeed.ts
rename to packages/util-crypto/src/ed25519/pair/fromSeed.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromString.spec.ts b/packages/util-crypto/src/ed25519/pair/fromString.spec.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromString.spec.ts
rename to packages/util-crypto/src/ed25519/pair/fromString.spec.ts
diff --git a/packages/util-crypto/src/ed25519/keypair/fromString.ts b/packages/util-crypto/src/ed25519/pair/fromString.ts
similarity index 100%
rename from packages/util-crypto/src/ed25519/keypair/fromString.ts
rename to packages/util-crypto/src/ed25519/pair/fromString.ts
diff --git a/packages/util-crypto/src/key/hdkdEcdsa.ts b/packages/util-crypto/src/key/hdkdEcdsa.ts
index 7ce1bf99a..b40b9bb93 100644
--- a/packages/util-crypto/src/key/hdkdEcdsa.ts
+++ b/packages/util-crypto/src/key/hdkdEcdsa.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { secp256k1DeriveHard } from '../secp256k1/deriveHard';
-import { secp256k1PairFromSeed } from '../secp256k1/keypair/fromSeed';
+import { secp256k1PairFromSeed } from '../secp256k1/pair/fromSeed';
 import { createSeedDeriveFn } from './hdkdDerive';
 
 export const keyHdkdEcdsa = createSeedDeriveFn(secp256k1PairFromSeed, secp256k1DeriveHard);
diff --git a/packages/util-crypto/src/mnemonic/toEntropy.spec.ts b/packages/util-crypto/src/mnemonic/toEntropy.spec.ts
index b732cf36f..4c7893f24 100644
--- a/packages/util-crypto/src/mnemonic/toEntropy.spec.ts
+++ b/packages/util-crypto/src/mnemonic/toEntropy.spec.ts
@@ -3,7 +3,7 @@
 
 import { u8aToHex } from '@polkadot/util';
 
-import tests from '../sr25519/keypair/testing';
+import tests from '../sr25519/pair/testing.spec';
 import { cryptoWaitReady } from '..';
 import { mnemonicToEntropy } from './toEntropy';
 
diff --git a/packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts b/packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts
index fd75d7c90..53e4f72af 100644
--- a/packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts
+++ b/packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts
@@ -3,7 +3,7 @@
 
 import { u8aEq, u8aToHex } from '@polkadot/util';
 
-import tests from '../sr25519/keypair/testing';
+import tests from '../sr25519/pair/testing.spec';
 import { cryptoWaitReady } from '..';
 import { mnemonicToMiniSecret } from './toMiniSecret';
 
diff --git a/packages/util-crypto/src/secp256k1/index.ts b/packages/util-crypto/src/secp256k1/index.ts
index 848c3b454..d2af8f5a3 100644
--- a/packages/util-crypto/src/secp256k1/index.ts
+++ b/packages/util-crypto/src/secp256k1/index.ts
@@ -3,7 +3,7 @@
 
 export { secp256k1Compress } from './compress';
 export { secp256k1Expand } from './expand';
-export { secp256k1PairFromSeed } from './keypair/fromSeed';
+export { secp256k1PairFromSeed } from './pair/fromSeed';
 export { secp256k1Recover } from './recover';
 export { secp256k1Sign } from './sign';
 export { secp256k1PrivateKeyTweakAdd } from './tweakAdd';
diff --git a/packages/util-crypto/src/secp256k1/keypair/fromSeed.spec.ts b/packages/util-crypto/src/secp256k1/pair/fromSeed.spec.ts
similarity index 100%
rename from packages/util-crypto/src/secp256k1/keypair/fromSeed.spec.ts
rename to packages/util-crypto/src/secp256k1/pair/fromSeed.spec.ts
diff --git a/packages/util-crypto/src/secp256k1/keypair/fromSeed.ts b/packages/util-crypto/src/secp256k1/pair/fromSeed.ts
similarity index 100%
rename from packages/util-crypto/src/secp256k1/keypair/fromSeed.ts
rename to packages/util-crypto/src/secp256k1/pair/fromSeed.ts
diff --git a/packages/util-crypto/src/sr25519/derive.ts b/packages/util-crypto/src/sr25519/derive.ts
index 3ea0fb254..63e23fda8 100644
--- a/packages/util-crypto/src/sr25519/derive.ts
+++ b/packages/util-crypto/src/sr25519/derive.ts
@@ -5,8 +5,8 @@ import type { Keypair } from '../types';
 
 import { assert, isU8a } from '@polkadot/util';
 
-import { sr25519PairFromU8a } from './keypair/fromU8a';
-import { sr25519KeypairToU8a } from './keypair/toU8a';
+import { sr25519PairFromU8a } from './pair/fromU8a';
+import { sr25519KeypairToU8a } from './pair/toU8a';
 
 export function createDeriveFn (derive: (pair: Uint8Array, cc: Uint8Array) => Uint8Array): (keypair: Keypair, chainCode: Uint8Array) => Keypair {
   return (keypair: Keypair, chainCode: Uint8Array): Keypair => {
diff --git a/packages/util-crypto/src/sr25519/index.ts b/packages/util-crypto/src/sr25519/index.ts
index f92a54b66..b0d14e2f5 100644
--- a/packages/util-crypto/src/sr25519/index.ts
+++ b/packages/util-crypto/src/sr25519/index.ts
@@ -5,7 +5,7 @@ export { sr25519Agreement } from './agreement';
 export { sr25519DeriveHard } from './deriveHard';
 export { sr25519DerivePublic } from './derivePublic';
 export { sr25519DeriveSoft } from './deriveSoft';
-export { sr25519PairFromSeed } from './keypair/fromSeed';
+export { sr25519PairFromSeed } from './pair/fromSeed';
 export { sr25519Sign } from './sign';
 export { sr25519Verify } from './verify';
 export { sr25519VrfSign } from './vrfSign';
diff --git a/packages/util-crypto/src/sr25519/keypair/fromSeed.spec.ts b/packages/util-crypto/src/sr25519/pair/fromSeed.spec.ts
similarity index 97%
rename from packages/util-crypto/src/sr25519/keypair/fromSeed.spec.ts
rename to packages/util-crypto/src/sr25519/pair/fromSeed.spec.ts
index 3c209f027..d646294ea 100644
--- a/packages/util-crypto/src/sr25519/keypair/fromSeed.spec.ts
+++ b/packages/util-crypto/src/sr25519/pair/fromSeed.spec.ts
@@ -6,7 +6,7 @@ import { waitReady } from '@polkadot/wasm-crypto';
 
 import { mnemonicToMiniSecret } from '../../mnemonic';
 import { sr25519PairFromSeed } from '..';
-import tests from './testing';
+import tests from './testing.spec';
 
 describe('sr25519PairFromSeed', (): void => {
   const TEST = stringToU8a('12345678901234567890123456789012');
diff --git a/packages/util-crypto/src/sr25519/keypair/fromSeed.ts b/packages/util-crypto/src/sr25519/pair/fromSeed.ts
similarity index 100%
rename from packages/util-crypto/src/sr25519/keypair/fromSeed.ts
rename to packages/util-crypto/src/sr25519/pair/fromSeed.ts
diff --git a/packages/util-crypto/src/sr25519/keypair/fromU8a.ts b/packages/util-crypto/src/sr25519/pair/fromU8a.ts
similarity index 100%
rename from packages/util-crypto/src/sr25519/keypair/fromU8a.ts
rename to packages/util-crypto/src/sr25519/pair/fromU8a.ts
diff --git a/packages/util-crypto/src/sr25519/keypair/testing.ts b/packages/util-crypto/src/sr25519/pair/testing.spec.ts
similarity index 99%
rename from packages/util-crypto/src/sr25519/keypair/testing.ts
rename to packages/util-crypto/src/sr25519/pair/testing.spec.ts
index b08ececd9..15737e95e 100644
--- a/packages/util-crypto/src/sr25519/keypair/testing.ts
+++ b/packages/util-crypto/src/sr25519/pair/testing.spec.ts
@@ -152,3 +152,7 @@ const tests: Test[] = [
 ];
 
 export default tests;
+
+it('has a test', (): void => {
+  expect(true).toEqual(true);
+});
diff --git a/packages/util-crypto/src/sr25519/keypair/toU8a.ts b/packages/util-crypto/src/sr25519/pair/toU8a.ts
similarity index 100%
rename from packages/util-crypto/src/sr25519/keypair/toU8a.ts
rename to packages/util-crypto/src/sr25519/pair/toU8a.ts
diff --git a/packages/util-crypto/src/sr25519/signVerify.spec.ts b/packages/util-crypto/src/sr25519/signVerify.spec.ts
index bca510304..877d6b903 100644
--- a/packages/util-crypto/src/sr25519/signVerify.spec.ts
+++ b/packages/util-crypto/src/sr25519/signVerify.spec.ts
@@ -5,7 +5,7 @@ import { stringToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';
 
 import { randomAsU8a } from '../random/asU8a';
-import { sr25519PairFromSeed } from './keypair/fromSeed';
+import { sr25519PairFromSeed } from './pair/fromSeed';
 import { sr25519Sign } from './sign';
 import { sr25519Verify } from './verify';
 
diff --git a/packages/util-crypto/src/sr25519/vrfSignVerify.spec.ts b/packages/util-crypto/src/sr25519/vrfSignVerify.spec.ts
index 07e89a10f..ca3b3105d 100644
--- a/packages/util-crypto/src/sr25519/vrfSignVerify.spec.ts
+++ b/packages/util-crypto/src/sr25519/vrfSignVerify.spec.ts
@@ -5,7 +5,7 @@ import { stringToU8a, u8aEq } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';
 
 import { randomAsU8a } from '../random/asU8a';
-import { sr25519PairFromSeed } from './keypair/fromSeed';
+import { sr25519PairFromSeed } from './pair/fromSeed';
 import { sr25519VrfSign } from './vrfSign';
 import { sr25519VrfVerify } from './vrfVerify';