fix: revert "binary" to "bin"

AztecProtocol · Nov 7, 2023 · 9966ddc · 9966ddc
1 parent c8b8181
commit 9966ddc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/yarn-project/foundation/src/noir/noir_package_config.ts b/yarn-project/foundation/src/noir/noir_package_config.ts
@@ -13,7 +13,7 @@ const noirLocalDependencySchema = z.object({
 const noirPackageConfigSchema = z.object({
   package: z.object({
     name: z.string().default(''),
-    type: z.enum(['lib', 'contract', 'binary']).default('binary'),
+    type: z.enum(['lib', 'contract', 'bin']).default('bin'),
     entry: z.string().optional(),
     description: z.string().optional(),
     authors: z.array(z.string()).optional(),

diff --git a/yarn-project/noir-compiler/src/compile/noir/noir-wasm-compiler.ts b/yarn-project/noir-compiler/src/compile/noir/noir-wasm-compiler.ts
@@ -83,14 +83,20 @@ export class NoirWasmContractCompiler {
    * Compiles the project.
    */
   public async compile(): Promise<NoirCompilationArtifacts[]> {
+    const isContract = this.#package.getType() === 'contract';
+    // limit to contracts-only because the rest of the pipeline only supports processing contracts
+    if (!isContract) {
+      throw new Error('Noir project is not a contract');
+    }
+
     this.#debugLog(`Compiling contract at ${this.#package.getEntryPointPath()}`);
     await this.#dependencyManager.resolveDependencies();
     this.#debugLog(`Dependencies: ${this.#dependencyManager.getPackageNames().join(', ')}`);
 
     initializeResolver(this.#resolveFile);
 
     try {
-      const result = compile(this.#package.getEntryPointPath(), true, {
+      const result = compile(this.#package.getEntryPointPath(), isContract, {
         /* eslint-disable camelcase */
         root_dependencies: this.#dependencyManager.getEntrypointDependencies(),
         library_dependencies: this.#dependencyManager.getLibraryDependencies(),

diff --git a/yarn-project/noir-compiler/src/compile/noir/package.ts b/yarn-project/noir-compiler/src/compile/noir/package.ts
@@ -47,7 +47,7 @@ export class NoirPackage {
         entrypoint = 'lib.nr';
         break;
       case 'contract':
-      case 'binary':
+      case 'bin':
         entrypoint = 'main.nr';
         break;
       default: