chore!: move default_is_opcode_supported to pwg.rs

acvm/src/lib.rs

@@ -8,10 +8,7 @@ pub mod compiler;
 pub mod pwg;
 
 use acir::{
-    circuit::{
-        opcodes::{BlackBoxFuncCall, FunctionInput},
-        Circuit, Opcode,
-    },
+    circuit::{opcodes::FunctionInput, Circuit, Opcode},
     native_types::{Witness, WitnessMap},
 };
 use core::fmt::Debug;
@@ -249,30 +246,3 @@ pub fn checksum_constraint_system(cs: &Circuit) -> u32 {
     hasher.update(&bytes);
     hasher.finalize()
 }
-
-#[deprecated(
-    note = "For backwards compatibility, this method allows you to derive _sensible_ defaults for opcode support based on the np language. \n Backends should simply specify what they support."
-)]
-// This is set to match the previous functionality that we had
-// Where we could deduce what opcodes were supported
-// by knowing the np complete language
-pub fn default_is_opcode_supported(language: Language) -> fn(&Opcode) -> bool {
-    // R1CS does not support any of the opcode except Arithmetic by default.
-    // The compiler will replace those that it can -- ie range, xor, and
-    fn r1cs_is_supported(opcode: &Opcode) -> bool {
-        matches!(opcode, Opcode::Arithmetic(_))
-    }
-
-    // PLONK supports most of the opcodes by default
-    // The ones which are not supported, the acvm compiler will
-    // attempt to transform into supported gates. If these are also not available
-    // then a compiler error will be emitted.
-    fn plonk_is_supported(opcode: &Opcode) -> bool {
-        !matches!(opcode, Opcode::BlackBoxFuncCall(BlackBoxFuncCall::AES { .. }) | Opcode::Block(_))
-    }
-
-    match language {
-        Language::R1CS => r1cs_is_supported,
-        Language::PLONKCSat { .. } => plonk_is_supported,
-    }
-}

acvm/src/pwg.rs

@@ -1,8 +1,8 @@
 // Re-usable methods that backends can use to implement their PWG
 
-use crate::PartialWitnessGenerator;
+use crate::{Language, PartialWitnessGenerator};
 use acir::{
-    circuit::opcodes::{Opcode, OracleData},
+    circuit::opcodes::{BlackBoxFuncCall, Opcode, OracleData},
     native_types::{Expression, Witness, WitnessMap},
     BlackBoxFunc, FieldElement,
 };
@@ -213,6 +213,33 @@ fn insert_value(
     Ok(())
 }
 
+#[deprecated(
+    note = "For backwards compatibility, this method allows you to derive _sensible_ defaults for opcode support based on the np language. \n Backends should simply specify what they support."
+)]
+// This is set to match the previous functionality that we had
+// Where we could deduce what opcodes were supported
+// by knowing the np complete language
+pub fn default_is_opcode_supported(language: Language) -> fn(&Opcode) -> bool {
+    // R1CS does not support any of the opcode except Arithmetic by default.
+    // The compiler will replace those that it can -- ie range, xor, and
+    fn r1cs_is_supported(opcode: &Opcode) -> bool {
+        matches!(opcode, Opcode::Arithmetic(_))
+    }
+
+    // PLONK supports most of the opcodes by default
+    // The ones which are not supported, the acvm compiler will
+    // attempt to transform into supported gates. If these are also not available
+    // then a compiler error will be emitted.
+    fn plonk_is_supported(opcode: &Opcode) -> bool {
+        !matches!(opcode, Opcode::BlackBoxFuncCall(BlackBoxFuncCall::AES { .. }) | Opcode::Block(_))
+    }
+
+    match language {
+        Language::R1CS => r1cs_is_supported,
+        Language::PLONKCSat { .. } => plonk_is_supported,
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::collections::BTreeMap;