fix: resolved feedback

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>
openwallet-foundation · Jan 18, 2024 · 6454a2d · 6454a2d
1 parent f0969be
commit 6454a2d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 43 deletions.
diff --git a/packages/indy-vdr/src/anoncreds/IndyVdrAnonCredsRegistry.ts b/packages/indy-vdr/src/anoncreds/IndyVdrAnonCredsRegistry.ts
@@ -30,7 +30,7 @@ import type {
   RegisterRevocationStatusListReturnStateAction,
   RegisterRevocationStatusListOptions,
 } from '@aries-framework/anoncreds'
-import type { AgentContext } from '@aries-framework/core'
+import { AgentContext, AriesFrameworkError } from '@aries-framework/core'
 import type { SchemaResponse } from '@hyperledger/indy-vdr-shared'
 
 import {
@@ -601,43 +601,10 @@ export class IndyVdrAnonCredsRegistry implements AnonCredsRegistry {
       let writeRequest: CustomRequest
       let didIndyRevocationRegistryDefinitionId: string
 
-      // TODO: this will bypass caching if done on a higher level.
-      const { credentialDefinition, resolutionMetadata } = await this.getCredentialDefinition(
-        agentContext,
+      const { schemaSeqNo, tag: credentialDefinitionTag } = parseIndyCredentialDefinitionId(
         revocationRegistryDefinition.credDefId
       )
 
-      if (!credentialDefinition) {
-        return {
-          registrationMetadata: {},
-          revocationRegistryDefinitionMetadata: {
-            didIndyNamespace: pool.indyNamespace,
-          },
-          revocationRegistryDefinitionState: {
-            state: 'failed',
-            reason: `error resolving credential definition with id ${revocationRegistryDefinition.credDefId}: ${resolutionMetadata.error} ${resolutionMetadata.message}`,
-          },
-        }
-      }
-
-      const { schemaMetadata } = await this.getSchema(agentContext, credentialDefinition.schemaId)
-
-      if (!schemaMetadata?.indyLedgerSeqNo || typeof schemaMetadata.indyLedgerSeqNo !== 'number') {
-        return {
-          registrationMetadata: {},
-          revocationRegistryDefinitionMetadata: {
-            didIndyNamespace: pool.indyNamespace,
-          },
-          revocationRegistryDefinitionState: {
-            revocationRegistryDefinition,
-            state: 'failed',
-            reason: `error resolving schema with id ${credentialDefinition.schemaId}: ${resolutionMetadata.error} ${resolutionMetadata.message}`,
-          },
-        }
-      }
-
-      const schemaSeqNo = schemaMetadata.indyLedgerSeqNo
-
       const { endorsedTransaction, endorserDid, endorserMode } = options
       if (endorsedTransaction) {
         agentContext.config.logger.debug(
@@ -649,29 +616,29 @@ export class IndyVdrAnonCredsRegistry implements AnonCredsRegistry {
           namespace,
           namespaceIdentifier,
           schemaSeqNo,
-          credentialDefinition.tag,
+          credentialDefinitionTag,
           revocationRegistryDefinition.tag
         )
       } else {
         const legacyRevocationRegistryDefinitionId = getUnqualifiedRevocationRegistryDefinitionId(
           namespaceIdentifier,
           schemaSeqNo,
-          credentialDefinition.tag,
+          credentialDefinitionTag,
           revocationRegistryDefinition.tag
         )
 
         didIndyRevocationRegistryDefinitionId = getDidIndyRevocationRegistryDefinitionId(
           namespace,
           namespaceIdentifier,
           schemaSeqNo,
-          credentialDefinition.tag,
+          credentialDefinitionTag,
           revocationRegistryDefinition.tag
         )
 
         const legacyCredentialDefinitionId = getUnqualifiedCredentialDefinitionId(
           namespaceIdentifier,
           schemaSeqNo,
-          credentialDefinition.tag
+          credentialDefinitionTag
         )
 
         const revocationRegistryDefinitionRequest = new RevocationRegistryDefinitionRequest({
@@ -880,10 +847,15 @@ export class IndyVdrAnonCredsRegistry implements AnonCredsRegistry {
       )
 
       if (revocationRegistryNamespace && revocationRegistryNamespace !== namespace) {
-        // throw error
+        throw new AriesFrameworkError(
+          `Issued id '${revocationStatusList.issuerId}' does not have the same namespace (${namespace}) as the revocation registry definition '${revocationRegistryNamespace}'`
+        )
       }
+
       if (revocationRegistryNamespaceIdentifier !== namespaceIdentifier) {
-        // throw error
+        throw new AriesFrameworkError(
+          `Cannot register revocation registry definition using a different DID. Revocation registry definition contains '${revocationRegistryNamespaceIdentifier}', but DID used was '${namespaceIdentifier}'`
+        )
       }
 
       if (endorsedTransaction) {

diff --git a/packages/indy-vdr/tests/indy-vdr-anoncreds-registry.e2e.test.ts b/packages/indy-vdr/tests/indy-vdr-anoncreds-registry.e2e.test.ts
@@ -90,7 +90,7 @@ describe('IndyVdrAnonCredsRegistry', () => {
     await agent.wallet.delete()
   })
 
-  xtest('register and resolve a schema and credential definition (internal, issuerDid != endorserDid)', async () => {
+  test('register and resolve a schema and credential definition (internal, issuerDid != endorserDid)', async () => {
     const didCreateResult = (await endorser.dids.create<IndyVdrDidCreateOptions>({
       method: 'indy',
       options: {
@@ -424,7 +424,7 @@ describe('IndyVdrAnonCredsRegistry', () => {
     })
   })
 
-  xtest('register and resolve a schema and credential definition (internal, issuerDid == endorserDid)', async () => {
+  test('register and resolve a schema and credential definition (internal, issuerDid == endorserDid)', async () => {
     const dynamicVersion = `1.${Math.random() * 100}`
 
     const legacyIssuerId = 'DJKobikPAaYWAu9vfhEEo5'