refactor!: nest ctype in ICTypeDetails (#766)

* refactor: nest ctype in ICTypeDetails * test: fix integration tests
KILTprotocol · Aug 3, 2023 · 064d15e · 064d15e
1 parent 2f39c14
commit 064d15e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/core/src/__integrationtests__/Ctypes.spec.ts b/packages/core/src/__integrationtests__/Ctypes.spec.ts
@@ -84,10 +84,10 @@ describe('When there is an CtypeCreator and a verifier', () => {
     if (hasBlockNumbers) {
       const retrievedCType = await CType.fetchFromChain(ctype.$id)
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { createdAt, creator, ...originalCtype } = retrievedCType
+      const { ctype: originalCtype, creator } = retrievedCType
       expect(originalCtype).toStrictEqual(ctype)
       expect(creator).toBe(ctypeCreator.uri)
-      await expect(CType.verifyStored(retrievedCType)).resolves.not.toThrow()
+      await expect(CType.verifyStored(originalCtype)).resolves.not.toThrow()
     }
   }, 40_000)
 

diff --git a/packages/core/src/ctype/CType.chain.ts b/packages/core/src/ctype/CType.chain.ts
@@ -83,7 +83,7 @@ export interface CTypeChainDetails {
   createdAt: BN
 }
 
-export type ICTypeDetails = ICType & CTypeChainDetails
+export type ICTypeDetails = { ctype: ICType } & CTypeChainDetails
 
 /**
  * Decodes the CType details returned by `api.query.ctype.ctypes()`.
@@ -226,8 +226,10 @@ export async function fetchFromChain(
   const [ctypeInput, creator] = lastRightCTypeCreationCall
 
   return {
-    ...ctypeInput,
-    $id: cTypeId,
+    ctype: {
+      ...ctypeInput,
+      $id: cTypeId,
+    },
     creator,
     createdAt,
   }