Fix rebase mistakes

Author: Avaneesh-axiom

extensions/algebra/circuit/src/fp2_extension.rs

@@ -36,7 +36,7 @@ impl Fp2Extension {
     pub fn generate_complex_init(&self, modular_config: &ModularExtension) -> String {
         fn get_index_of_modulus(modulus: &BigUint, modular_config: &ModularExtension) -> usize {
             modular_config
-                .supported_modulus
+                .supported_moduli
                 .iter()
                 .position(|m| m == modulus)
                 .expect("Modulus used in Fp2Extension not found in ModularExtension")

extensions/algebra/circuit/src/modular_extension.rs

@@ -36,7 +36,7 @@ impl ModularExtension {
     // Generates a call to the moduli_init! macro with moduli in the correct order
     pub fn generate_moduli_init(&self) -> String {
         let supported_moduli = self
-            .supported_modulus
+            .supported_moduli
             .iter()
             .map(|modulus| format!("\"{}\"", modulus))
             .collect::<Vec<String>>()

extensions/algebra/guest/src/lib.rs

@@ -54,7 +54,6 @@ use core::{
 pub use field::Field;
 #[cfg(not(target_os = "zkvm"))]
 use num_bigint::BigUint;
-pub use once_cell;
 pub use openvm_algebra_complex_macros as complex_macros;
 pub use openvm_algebra_moduli_macros as moduli_macros;
 #[cfg(target_os = "zkvm")]

extensions/algebra/moduli-macros/src/lib.rs

@@ -1081,10 +1081,6 @@ pub fn moduli_init(input: TokenStream) -> TokenStream {
             }
         });
 
-        setup_all_moduli.push(quote::quote_spanned! { span.into() =>
-            #setup_function();
-        });
-
         setups.push(quote::quote_spanned! { span.into() =>
             #[allow(non_snake_case)]
             #[no_mangle]

extensions/algebra/tests/programs/examples/sqrt.rs

@@ -14,13 +14,9 @@ openvm_algebra_moduli_macros::moduli_declare! {
     }
 }
 
-openvm_algebra_moduli_macros::moduli_init!(
-    "0xFFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFFC2F"
-);
+openvm::init!();
 
 pub fn main() {
-    setup_all_moduli();
-
     let a = Secp256k1Coord::from_u32(4);
     let sqrt = a.sqrt();
     assert_eq!(sqrt, Some(Secp256k1Coord::from_u32(2)));

extensions/algebra/tests/src/lib.rs

@@ -168,7 +168,8 @@ mod tests {
 
     #[test]
     fn test_sqrt() -> Result<()> {
-        let elf = build_example_program_at_path(get_programs_dir!(), "sqrt")?;
+        let config = Rv32ModularConfig::new(vec![SECP256K1_CONFIG.modulus.clone()]);
+        let elf = build_example_program_at_path(get_programs_dir!(), "sqrt", &config)?;
         let openvm_exe = VmExe::from_elf(
             elf,
             Transpiler::<F>::default()
@@ -177,7 +178,6 @@ mod tests {
                 .with_extension(Rv32IoTranspilerExtension)
                 .with_extension(ModularTranspilerExtension),
         )?;
-        let config = Rv32ModularConfig::new(vec![SECP256K1_CONFIG.modulus.clone()]);
         air_test(config, openvm_exe);
         Ok(())
     }