refactor: review suggestions

KILTprotocol · Aug 24, 2023 · 7cb6735 · 7cb6735
1 parent 0a3fbf0
commit 7cb6735
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/packages/legacy-credentials/src/utils.ts b/packages/legacy-credentials/src/utils.ts
@@ -22,15 +22,24 @@ export function jsonLDcontents(
   expanded = true
 ): Record<string, unknown> {
   const { cTypeHash, contents, owner } = claim
-  if (!cTypeHash) throw new SDKErrors.CTypeHashMissingError()
+  if (!cTypeHash) {
+    throw new SDKErrors.CTypeHashMissingError()
+  }
   const vocabulary = `${CType.hashToId(cTypeHash)}#`
   const result: Record<string, unknown> = {}
-  if (owner) result['@id'] = owner
+  if (owner) {
+    result['@id'] = owner
+  }
   if (!expanded) {
+    if (contents && ('@context' in contents || '@id' in contents)) {
+      throw new Error(
+        'This claim contains @-prefixed restricted properties and thus cannot be properly expressed as JSON-LD'
+      )
+    }
     return {
+      ...contents,
       ...result,
       '@context': { '@vocab': vocabulary },
-      ...contents,
     }
   }
   Object.entries(contents || {}).forEach(([key, value]) => {

diff --git a/packages/legacy-credentials/src/vcInterop.spec.ts b/packages/legacy-credentials/src/vcInterop.spec.ts
@@ -218,7 +218,7 @@ it('reproduces credential in round trip', () => {
   expect(fromVC(VC)).toMatchObject(credential)
 })
 
-it.skip('it verifies credential with selected properties revealed', async () => {
+it('it verifies credential with selected properties revealed', async () => {
   const reducedCredential = removeClaimProperties(credential, [
     'name',
     'birthday',
@@ -231,6 +231,9 @@ it.skip('it verifies credential with selected properties revealed', async () =>
   })
 
   await expect(
-    KiltAttestationProofV1.verify(reducedVC, proof, { api: mockedApi })
+    KiltAttestationProofV1.verify(reducedVC, proof, {
+      api: mockedApi,
+      cTypes: [cType],
+    })
   ).resolves.not.toThrow()
 })
diff --git a/packages/legacy-credentials/src/vcInterop.ts b/packages/legacy-credentials/src/vcInterop.ts
@@ -29,7 +29,7 @@ import { makeStatementsJsonLD } from './utils.js'
  * @param opts.blockHash Hash of a block at which the proof must be verifiable.
  * @returns An embedded proof for a verifiable credential derived from the input.
  */
-export function proofFromICredential(
+function proofFromICredential(
   credential: ICredential,
   { blockHash }: { blockHash: Uint8Array }
 ): Types.KiltAttestationProofV1 {
@@ -62,7 +62,7 @@ export function proofFromICredential(
  * @param options.chainGenesisHash Optional: Genesis hash of the chain against which this credential is verifiable. Defaults to the spiritnet genesis hash.
  * @returns A KiltCredentialV1 with embedded KiltAttestationProofV1 proof.
  */
-export function vcFromICredential(
+function vcFromICredential(
   input: ICredential,
   {
     issuer,

diff --git a/packages/vc-export/src/__mocks__/testData.ts b/packages/vc-export/src/__mocks__/testData.ts
@@ -26,7 +26,9 @@ import { KiltCredentialV1 } from '../types'
 export const mockedApi = ApiMocks.createAugmentedApi()
 
 const attestationCreatedIndex = u8aToU8a([
-  62,
+  mockedApi.runtimeMetadata.asLatest.pallets
+    .find((x) => x.name.match(/attestation/i))!
+    .index.toNumber(),
   mockedApi.events.attestation.AttestationCreated.meta.index.toNumber(),
 ])
 export function makeAttestationCreatedEvents(events: unknown[][]) {