Skip to content

Commit

Permalink
Merge branch 'master' into tf/nargo-watch
Browse files Browse the repository at this point in the history
* master:
  feat: Sync from aztec-packages (#4465)
  feat: Add eddsa_poseidon_to_pub function to stdlib with test + docs (#4473)
  chore(deps): bump mio from 0.8.10 to 0.8.11 (#4478)
  chore: Capitalize containers section in docs (#4471)
  • Loading branch information
TomAFrench committed Mar 5, 2024
2 parents 6daab1e + 5f57ebb commit cedee07
Show file tree
Hide file tree
Showing 30 changed files with 243 additions and 284 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/
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 cedee07

Please sign in to comment.