Skip to content

Commit

Permalink
feat: Sync from aztec-packages (#4465)
Browse files Browse the repository at this point in the history
BEGIN_COMMIT_OVERRIDE
feat!: Internal as a macro
(AztecProtocol/aztec-packages#4898)
chore: remove import of `dep::aztec` from aztec_macros
(AztecProtocol/aztec-packages#4941)
fix: noir test incorrect reporting
(AztecProtocol/aztec-packages#4925)
END_COMMIT_OVERRIDE

---------

Co-authored-by: Tom French <tom@tomfren.ch>
Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com>
  • Loading branch information
3 people authored Mar 5, 2024
1 parent 00d2c32 commit 5f57ebb
Show file tree
Hide file tree
Showing 25 changed files with 210 additions and 280 deletions.
2 changes: 1 addition & 1 deletion .aztec-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9e246c1289fa40c35c4b28d2f0081dfdc2aa9d19
73d640a4a033f0c865d45da470ef40c1fb03a844
27 changes: 0 additions & 27 deletions .dockerignore

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,5 @@ tooling/noirc_abi_wasm/nodejs
tooling/noirc_abi_wasm/web
tooling/noir_js/lib

**/package.tgz
packages

# docs autogen build
/docs/docs/noir_js/reference/
12 changes: 0 additions & 12 deletions Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions Dockerfile.packages

This file was deleted.

12 changes: 10 additions & 2 deletions acvm-repo/acvm_js/test/node/build_info.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@ import { BuildInfo, buildInfo } from '@noir-lang/acvm_js';
import child_process from 'child_process';
import pkg from '../../package.json';

it('returns the correct build into', () => {
it('returns the correct build info', () => {
let revision: string;

try {
revision = child_process.execSync('git rev-parse HEAD').toString().trim();
} catch (error) {
console.log('Failed to get revision, skipping test.');
return;
}

const info: BuildInfo = buildInfo();

// TODO: enforce that `package.json` and `Cargo.toml` are consistent.
expect(info.version).to.be.eq(pkg.version);

const revision = child_process.execSync('git rev-parse HEAD').toString().trim();
expect(info.gitHash).to.be.eq(revision);
});
Loading

0 comments on commit 5f57ebb

Please sign in to comment.