chore: enable skipped ordering tests since AVM properly updates side-…

…effect counter for nested calls
AztecProtocol · Jun 14, 2024 · e8f08b9 · e8f08b9
1 parent cea0b3b
commit e8f08b9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr b/noir-projects/aztec-nr/aztec/src/oracle/public_call.nr
@@ -1,5 +1,4 @@
 use dep::protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress};
-// TODO(6052): get new side effect counter from this call
 #[oracle(callPublicFunction)]
 unconstrained fn call_public_function_oracle<RETURNS_COUNT>(
     _contract_address: AztecAddress,

diff --git a/noir-projects/noir-contracts/contracts/child_contract/src/main.nr b/noir-projects/noir-contracts/contracts/child_contract/src/main.nr
@@ -104,8 +104,6 @@ contract Child {
     }
 
     #[aztec(public)]
-    // TODO(6052): The logs emitted are currently in the wrong order as we don't update
-    // counters for nested public calls
     fn set_value_with_two_nested_calls() {
         Child::at(context.this_address()).set_value_twice_with_nested_first().call(&mut context);
         Child::at(context.this_address()).set_value_twice_with_nested_last().call(&mut context);

diff --git a/yarn-project/end-to-end/src/e2e_ordering.test.ts b/yarn-project/end-to-end/src/e2e_ordering.test.ts
@@ -92,22 +92,21 @@ describe('e2e_ordering', () => {
       const expectedOrders = {
         set_value_twice_with_nested_first: [nestedValue, directValue] as bigint[], // eslint-disable-line camelcase
         set_value_twice_with_nested_last: [directValue, nestedValue] as bigint[], // eslint-disable-line camelcase
-        // TODO(6052)
-        // set_value_with_two_nested_calls: [nestedValue, directValue, directValue, nestedValue, directValue] as bigint[], // eslint-disable-line camelcase
+        set_value_with_two_nested_calls: [nestedValue, directValue, directValue, nestedValue, directValue] as bigint[], // eslint-disable-line camelcase
       } as const;
 
-      // TODO(6052): Once resolved, add 'set_value_with_nested_calls'
-      it.each(['set_value_twice_with_nested_first', 'set_value_twice_with_nested_last'] as const)(
-        'orders public state updates in %s (and ensures final state value is correct)',
-        async method => {
-          const expectedOrder = expectedOrders[method];
+      it.each([
+        'set_value_twice_with_nested_first',
+        'set_value_twice_with_nested_last',
+        'set_value_with_two_nested_calls',
+      ] as const)('orders public state updates in %s (and ensures final state value is correct)', async method => {
+        const expectedOrder = expectedOrders[method];
 
-          await child.methods[method]().send().wait();
+        await child.methods[method]().send().wait();
 
-          const value = await pxe.getPublicStorageAt(child.address, new Fr(1));
-          expect(value.value).toBe(expectedOrder[expectedOrder.length - 1]); // final state should match last value set
-        },
-      );
+        const value = await pxe.getPublicStorageAt(child.address, new Fr(1));
+        expect(value.value).toBe(expectedOrder[expectedOrder.length - 1]); // final state should match last value set
+      });
 
       // TODO(#838): Public kernel outputs logs in wrong order!
       // Full explanation:
@@ -116,18 +115,18 @@ describe('e2e_ordering', () => {
       //     in reverse order. More info in this thread: https://discourse.aztec.network/t/identifying-the-ordering-of-state-access-across-contract-calls/382/12#transition-counters-for-private-calls-2
       // The below only works due to a hack which sorts the logs in ts
       // See tail_phase_manager.ts
-      // TODO(6052): Once resolved, add 'set_value_with_two_nested_calls'
-      it.each(['set_value_twice_with_nested_first', 'set_value_twice_with_nested_last'] as const)(
-        'orders unencrypted logs in %s',
-        async method => {
-          const expectedOrder = expectedOrders[method];
-
-          await child.methods[method]().send().wait();
-
-          // Logs are emitted in the expected order
-          await expectLogsFromLastBlockToBe(expectedOrder);
-        },
-      );
+      it.each([
+        'set_value_twice_with_nested_first',
+        'set_value_twice_with_nested_last',
+        'set_value_with_two_nested_calls',
+      ] as const)('orders unencrypted logs in %s', async method => {
+        const expectedOrder = expectedOrders[method];
+
+        await child.methods[method]().send().wait();
+
+        // Logs are emitted in the expected order
+        await expectLogsFromLastBlockToBe(expectedOrder);
+      });
     });
   });
 });