Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fixing test contract fixture #9909

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

sklppy88
Copy link
Contributor

@sklppy88 sklppy88 commented Nov 12, 2024

This just fixes a utility function that seems to be a typo, as it is has the same content as the function above it, and uses the same artifact. This also bumps the timeout of pxe.test.ts because we were seeing some issues in timeouts with adding contract artifact.

@sklppy88 sklppy88 changed the title init chore: fixing test contract fixture Nov 12, 2024
@sklppy88 sklppy88 force-pushed the ek/chore/fix-test-contract-fixture branch from ec72ad7 to c4544b9 Compare November 12, 2024 18:13
@sklppy88 sklppy88 marked this pull request as ready for review November 12, 2024 18:14
@sklppy88 sklppy88 force-pushed the ek/chore/fix-test-contract-fixture branch from c4544b9 to 4aea1b9 Compare November 13, 2024 13:42
Copy link
Contributor

github-actions bot commented Nov 13, 2024

Changes to circuit sizes

Generated at commit: 1d3ef93a97c51e934cbdc2dce138ec4c762f72ee, compared to commit: 3830e2a81cca4ff4782000847aefe011fbb6ee0c

🧾 Summary (100% most significant diffs)

Program ACIR opcodes (+/-) % Circuit size (+/-) %
private_kernel_init +23 ❌ +0.11% +21 ❌ +0.06%
private_kernel_inner +26 ❌ +0.07% +22 ❌ +0.04%
private_kernel_tail +3 ❌ +0.07% +3 ❌ +0.02%
parity_base +3 ❌ +0.07% +3 ❌ +0.01%
private_kernel_tail_to_public +3 ❌ +0.02% +3 ❌ +0.01%
private_kernel_reset_4_4_4_4_4_4_4_4_1 +1 ❌ +0.00% +1 ❌ +0.00%
rollup_base_private +38 ❌ +0.01% +38 ❌ +0.00%
rollup_base_public +38 ❌ +0.01% +38 ❌ +0.00%
rollup_merge +4 ❌ +0.12% +4 ❌ +0.00%
rollup_root +4 ❌ +0.03% +4 ❌ +0.00%
rollup_block_merge +4 ❌ +0.03% +4 ❌ +0.00%
private_kernel_reset +1 ❌ +0.00% +1 ❌ +0.00%
rollup_block_root +4 ❌ +0.09% +4 ❌ +0.00%
parity_root +3 ❌ +0.06% +3 ❌ +0.00%

Full diff report 👇
Program ACIR opcodes (+/-) % Circuit size (+/-) %
private_kernel_init 21,726 (+23) +0.11% 34,887 (+21) +0.06%
private_kernel_inner 38,093 (+26) +0.07% 57,530 (+22) +0.04%
private_kernel_tail 4,493 (+3) +0.07% 13,045 (+3) +0.02%
parity_base 4,301 (+3) +0.07% 30,698 (+3) +0.01%
private_kernel_tail_to_public 18,852 (+3) +0.02% 31,300 (+3) +0.01%
private_kernel_reset_4_4_4_4_4_4_4_4_1 32,455 (+1) +0.00% 86,600 (+1) +0.00%
rollup_base_private 332,907 (+38) +0.01% 3,432,553 (+38) +0.00%
rollup_base_public 470,092 (+38) +0.01% 3,770,598 (+38) +0.00%
rollup_merge 3,419 (+4) +0.12% 1,909,446 (+4) +0.00%
rollup_root 11,989 (+4) +0.03% 1,940,906 (+4) +0.00%
rollup_block_merge 12,005 (+4) +0.03% 1,940,920 (+4) +0.00%
private_kernel_reset 84,097 (+1) +0.00% 618,117 (+1) +0.00%
rollup_block_root 4,489 (+4) +0.09% 2,863,252 (+4) +0.00%
parity_root 5,034 (+3) +0.06% 3,801,552 (+3) +0.00%

@sklppy88 sklppy88 force-pushed the ek/chore/fix-test-contract-fixture branch from 4aea1b9 to 7482995 Compare November 13, 2024 14:35
@sklppy88 sklppy88 force-pushed the ek/chore/fix-test-contract-fixture branch from 7482995 to 4bf0326 Compare November 13, 2024 15:35
@sklppy88 sklppy88 requested a review from spalladino November 13, 2024 16:05
@@ -40,6 +40,8 @@ describe('unconstrained_function_membership_proof', () => {
expect(artifact.functions.filter(isUnconstrained).length).toBe(1);

const unconstrainedFunction = unconstrainedFns[0];
const selector = FunctionSelector.fromNameAndParameters(unconstrainedFunction);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needed to be fixed because previously it was using the selector set on L24 which is not the same selector as the unconstrained function set here !

@sklppy88 sklppy88 requested a review from benesjan November 13, 2024 16:07
@sklppy88 sklppy88 merged commit 4fdcc14 into master Nov 13, 2024
70 checks passed
@sklppy88 sklppy88 deleted the ek/chore/fix-test-contract-fixture branch November 13, 2024 16:19
stevenplatt pushed a commit that referenced this pull request Nov 13, 2024
This just fixes a utility function that seems to be a typo, as it is has
the same content as the function above it, and uses the same artifact.
This also bumps the timeout of `pxe.test.ts` because we were seeing some
issues in timeouts with adding contract artifact.
TomAFrench added a commit that referenced this pull request Nov 14, 2024
* master: (245 commits)
  chore: pull signed bitshifts from sync PR (#9939)
  chore: pull frontend changes from sync PR (#9935)
  feat: separate bytecode logs from unencrypted logs (#9891)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix: token naming issue (#9950)
  feat: multiplier oracle (#9902)
  refactor: token refunds cleanup (#9943)
  chore: Use stack based recursion instead of function recursion (#9947)
  feat: parallelize DIE pass (#9933)
  feat(avm): Simulator enforces integral tag for DIV and field tag for FDIV (#9944)
  chore(avm): bugfixing witness generation for add, sub, mul for FF (#9938)
  feat: Google Cloud Kubernetes cluster + AWS Firewall Rules (#9915)
  chore: nuking ancient redundant test (#9941)
  fix: include 'master' version for aztec-up scripts (#9940)
  chore: fixing test contract fixture (#9909)
  refactor: token naming cleanup (#9904)
  chore: pull SSA parser from sync PR (#9928)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants