fix: fix conversion and leftover only

AztecProtocol · Feb 21, 2025 · f1d9bc4 · f1d9bc4
1 parent aa4c30f
commit f1d9bc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts b/yarn-project/end-to-end/src/e2e_deploy_contract/contract_class_registration.test.ts
@@ -60,7 +60,7 @@ describe('e2e_deploy_contract contract class registration', () => {
   });
 
   describe('registering a contract class', () => {
-    it.only('optionally emits public bytecode', async () => {
+    it('optionally emits public bytecode', async () => {
       const registrationTxReceipt = await registerContractClass(wallet, TestContract.artifact, true).then(c =>
         c.send().wait(),
       );

diff --git a/yarn-project/noir-protocol-circuits-types/src/conversion/server.ts b/yarn-project/noir-protocol-circuits-types/src/conversion/server.ts
@@ -78,10 +78,10 @@ import type {
   BlockRootRollupData as BlockRootRollupDataNoir,
   BlockRootRollupInputs as BlockRootRollupInputsNoir,
   ConstantRollupData as ConstantRollupDataNoir,
+  ContractClassLog as ContractClassLogNoir,
   EmptyBlockRootRollupInputs as EmptyBlockRootRollupInputsNoir,
   FeeRecipient as FeeRecipientNoir,
   FixedLengthArray,
-  Log as LogNoir,
   MergeRollupInputs as MergeRollupInputsNoir,
   Field as NoirField,
   ParityPublicInputs as ParityPublicInputsNoir,
@@ -308,12 +308,15 @@ export function mapBlockBlobPublicInputsFromNoir(
  * @param log - The ts contract class log.
  * @returns The noir contract class log.
  */
-export function mapContractClassLogToNoir(log: ContractClassLog): LogNoir<typeof CONTRACT_CLASS_LOG_SIZE_IN_FIELDS> {
+export function mapContractClassLogToNoir(log: ContractClassLog): ContractClassLogNoir {
   return {
-    // @ts-expect-error - below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
-    fields: Array.from({ length: CONTRACT_CLASS_LOG_SIZE_IN_FIELDS }, (_, idx) =>
-      mapFieldToNoir(log.fields[idx]),
-    ) as Tuple<string, typeof CONTRACT_CLASS_LOG_SIZE_IN_FIELDS>,
+    log: {
+      // @ts-expect-error - below line gives error 'Type instantiation is excessively deep and possibly infinite. ts(2589)'
+      fields: Array.from({ length: CONTRACT_CLASS_LOG_SIZE_IN_FIELDS }, (_, idx) =>
+        mapFieldToNoir(log.fields[idx]),
+      ) as Tuple<string, typeof CONTRACT_CLASS_LOG_SIZE_IN_FIELDS>,
+    },
+    contract_address: mapAztecAddressToNoir(log.contractAddress),
   };
 }