From 6a2330ce02f0a69a39e4f315d2bd422de4c72f13 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 22 May 2023 10:19:48 -0700 Subject: [PATCH] fix compilation issue --- crates/noirc_evaluator/src/lib.rs | 4 ++-- crates/noirc_evaluator/src/ssa_refactor.rs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/noirc_evaluator/src/lib.rs b/crates/noirc_evaluator/src/lib.rs index 4c70e15bcb4..924e6ad3f9d 100644 --- a/crates/noirc_evaluator/src/lib.rs +++ b/crates/noirc_evaluator/src/lib.rs @@ -13,7 +13,7 @@ pub mod ssa_refactor; use acvm::{ acir::circuit::{opcodes::Opcode as AcirOpcode, Circuit, PublicInputs}, acir::native_types::{Expression, Witness}, - compiler::{optimizers::simplify::CircuitSimplifier, transformers::IsOpcodeSupported}, + compiler::optimizers::simplify::CircuitSimplifier, Language, }; use errors::{RuntimeError, RuntimeErrorKind}; @@ -66,7 +66,7 @@ pub struct Evaluator { pub fn create_circuit( program: Program, np_language: Language, - is_opcode_supported: IsOpcodeSupported, + is_opcode_supported: fn(&AcirOpcode) -> bool, enable_logging: bool, show_output: bool, ) -> Result<(Circuit, Abi), RuntimeError> { diff --git a/crates/noirc_evaluator/src/ssa_refactor.rs b/crates/noirc_evaluator/src/ssa_refactor.rs index 34061227336..60eb0efabf2 100644 --- a/crates/noirc_evaluator/src/ssa_refactor.rs +++ b/crates/noirc_evaluator/src/ssa_refactor.rs @@ -8,7 +8,10 @@ #![allow(dead_code)] use crate::errors::RuntimeError; -use acvm::{acir::circuit::Circuit, compiler::transformers::IsOpcodeSupported, Language}; +use acvm::{ + acir::circuit::{Circuit, Opcode}, + Language, +}; use noirc_abi::Abi; use noirc_frontend::monomorphization::ast::Program; @@ -33,7 +36,7 @@ pub fn optimize_into_acir(program: Program) -> Acir { pub fn experimental_create_circuit( _program: Program, _np_language: Language, - _is_opcode_supported: IsOpcodeSupported, + _is_opcode_supported: fn(&Opcode) -> bool, _enable_logging: bool, _show_output: bool, ) -> Result<(Circuit, Abi), RuntimeError> {