fix(dids): resolved feedback

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
openwallet-foundation · Jul 8, 2024 · 4478cc4 · 4478cc4
1 parent 6fdcf57
commit 4478cc4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/core/src/modules/dids/methods/jwk/JwkDidRegistrar.ts b/packages/core/src/modules/dids/methods/jwk/JwkDidRegistrar.ts
@@ -29,12 +29,12 @@ export class JwkDidRegistrar implements DidRegistrar {
           didRegistrationMetadata: {},
           didState: {
             state: 'failed',
-            reason: 'Key instance cannot be combined with key type, seed and or private key',
+            reason: 'Key instance cannot be combined with key type, seed or private key',
           },
         }
       }
 
-      if (!key && keyType) {
+      if (keyType) {
         key = await agentContext.wallet.createKey({
           keyType,
           seed,

diff --git a/packages/core/src/modules/dids/methods/jwk/__tests__/JwkDidRegistrar.test.ts b/packages/core/src/modules/dids/methods/jwk/__tests__/JwkDidRegistrar.test.ts
@@ -116,7 +116,7 @@ describe('DidRegistrar', () => {
         didRegistrationMetadata: {},
         didState: {
           state: 'failed',
-          reason: 'Key instance cannot be combined with key type, seed and or private key',
+          reason: 'Key instance cannot be combined with key type, seed or private key',
         },
       })
     })

diff --git a/packages/core/src/modules/dids/methods/key/KeyDidRegistrar.ts b/packages/core/src/modules/dids/methods/key/KeyDidRegistrar.ts
@@ -28,12 +28,12 @@ export class KeyDidRegistrar implements DidRegistrar {
           didRegistrationMetadata: {},
           didState: {
             state: 'failed',
-            reason: 'Key instance cannot be combined with key type, seed and or private key',
+            reason: 'Key instance cannot be combined with key type, seed or private key',
           },
         }
       }
 
-      if (!key && keyType) {
+      if (keyType) {
         key = await agentContext.wallet.createKey({
           keyType,
           seed,

diff --git a/packages/core/src/modules/dids/methods/key/__tests__/KeyDidRegistrar.test.ts b/packages/core/src/modules/dids/methods/key/__tests__/KeyDidRegistrar.test.ts
@@ -80,7 +80,7 @@ describe('DidRegistrar', () => {
         didRegistrationMetadata: {},
         didState: {
           state: 'failed',
-          reason: 'Key instance cannot be combined with key type, seed and or private key',
+          reason: 'Key instance cannot be combined with key type, seed or private key',
         },
       })
     })

diff --git a/packages/core/src/modules/dids/methods/peer/PeerDidRegistrar.ts b/packages/core/src/modules/dids/methods/peer/PeerDidRegistrar.ts
@@ -45,12 +45,12 @@ export class PeerDidRegistrar implements DidRegistrar {
             didRegistrationMetadata: {},
             didState: {
               state: 'failed',
-              reason: 'Key instance cannot be combined with key type, seed and or private key',
+              reason: 'Key instance cannot be combined with key type, seed or private key',
             },
           }
         }
 
-        if (!key && keyType) {
+        if (keyType) {
           key = await agentContext.wallet.createKey({
             keyType,
             seed,

diff --git a/packages/core/src/modules/dids/methods/peer/__tests__/PeerDidRegistrar.test.ts b/packages/core/src/modules/dids/methods/peer/__tests__/PeerDidRegistrar.test.ts
@@ -79,7 +79,7 @@ describe('DidRegistrar', () => {
           didRegistrationMetadata: {},
           didState: {
             state: 'failed',
-            reason: 'Key instance cannot be combined with key type, seed and or private key',
+            reason: 'Key instance cannot be combined with key type, seed or private key',
           },
         })
       })