refactor: remove unused properties from key generation and test cases

Author: larryrider

src/services/crypto.service.ts

@@ -18,12 +18,9 @@ export class CryptoService {
       return CryptoService.instance.encryptText(hashObj.hash);
     },
     async generateKeys(password: Password): Promise<Keys> {
-      const { privateKeyArmoredEncrypted, publicKeyArmored, revocationCertificate } =
+      const { privateKeyArmoredEncrypted, publicKeyArmored } =
         await KeysService.instance.generateNewKeysWithEncrypted(password);
       const keys: Keys = {
-        privateKeyEncrypted: privateKeyArmoredEncrypted,
-        publicKey: publicKeyArmored,
-        revocationCertificate: revocationCertificate,
         ecc: {
           privateKeyEncrypted: privateKeyArmoredEncrypted,
           publicKey: publicKeyArmored,

test/services/crypto.service.test.ts

@@ -87,9 +87,6 @@ describe('Crypto service', () => {
       .mockResolvedValue(keysReturned);
 
     const expectedKeys: Keys = {
-      privateKeyEncrypted: keysReturned.privateKeyArmoredEncrypted,
-      publicKey: keysReturned.publicKeyArmored,
-      revocationCertificate: keysReturned.revocationCertificate,
       ecc: {
         privateKeyEncrypted: keysReturned.privateKeyArmoredEncrypted,
         publicKey: keysReturned.publicKeyArmored,

test/services/keys.service.test.ts

@@ -28,16 +28,17 @@ describe('Keys service', () => {
   });
 
   test('when new encryption keys are needed, then they are generated using the cryptography library', async () => {
-    interface KeyPair {
+    interface PgpGenerationKeys {
       privateKey: openpgp.PrivateKey;
       publicKey: openpgp.PublicKey;
+      revocationCertificate: string;
     }
 
     const pgpKeys = {
       privateKey: crypto.randomBytes(16).toString('hex'),
       publicKey: crypto.randomBytes(16).toString('hex'),
       revocationCertificate: crypto.randomBytes(16).toString('hex'),
-    } as unknown as KeyPair & { revocationCertificate: string };
+    } as unknown as PgpGenerationKeys;
 
     const pgpKeysWithEncrypted = {
       privateKeyArmored: pgpKeys.privateKey,