Use SierraGenerator for testing (part 3)

src/libfuncs/pedersen.rs

@@ -97,29 +97,33 @@ pub fn build_pedersen<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{load_cairo, run_program_assert_output};
+    use crate::{
+        utils::{sierra_gen::SierraGenerator, test::run_sierra_program},
+        Value,
+    };
 
+    use cairo_lang_sierra::extensions::pedersen::PedersenHashLibfunc;
     use starknet_types_core::felt::Felt;
 
     #[test]
     fn run_pedersen() {
-        let program = load_cairo!(
-            use core::pedersen::pedersen;
-
-            fn run_test(a: felt252, b: felt252) -> felt252 {
-                pedersen(a, b)
-            }
-        );
-
-        run_program_assert_output(
-            &program,
-            "run_test",
-            &[Felt::from(2).into(), Felt::from(4).into()],
-            Felt::from_dec_str(
-                "2178161520066714737684323463974044933282313051386084149915030950231093462467",
-            )
-            .unwrap()
-            .into(),
+        let program = {
+            let generator = SierraGenerator::<PedersenHashLibfunc>::default();
+
+            generator.build(&[])
+        };
+
+        let result = run_sierra_program(&program, &[Felt::from(2).into(), Felt::from(4).into()])
+            .return_value;
+
+        assert_eq!(
+            Value::Felt252(
+                Felt::from_dec_str(
+                    "2178161520066714737684323463974044933282313051386084149915030950231093462467",
+                )
+                .unwrap()
+            ),
+            result
         );
     }
 }

src/libfuncs/poseidon.rs

@@ -111,28 +111,33 @@ pub fn build_hades_permutation<'ctx>(
 
 #[cfg(test)]
 mod test {
-    use crate::utils::test::{jit_struct, load_cairo, run_program_assert_output};
+    use crate::utils::{
+        sierra_gen::SierraGenerator,
+        test::{jit_struct, run_sierra_program},
+    };
 
+    use cairo_lang_sierra::extensions::poseidon::HadesPermutationLibfunc;
     use starknet_types_core::felt::Felt;
 
     #[test]
     fn run_hades_permutation() {
-        let program = load_cairo!(
-            use core::poseidon::hades_permutation;
+        let program = {
+            let generator = SierraGenerator::<HadesPermutationLibfunc>::default();
 
-            fn run_test(a: felt252, b: felt252, c: felt252) -> (felt252, felt252, felt252) {
-                hades_permutation(a, b, c)
-            }
-        );
+            generator.build(&[])
+        };
 
-        run_program_assert_output(
+        let result = run_sierra_program(
             &program,
-            "run_test",
             &[
                 Felt::from(2).into(),
                 Felt::from(4).into(),
                 Felt::from(4).into(),
             ],
+        )
+        .return_value;
+
+        assert_eq!(
             jit_struct!(
                 Felt::from_dec_str(
                     "1627044480024625333712068603977073585655327747658231320998869768849911913066"
@@ -150,6 +155,7 @@ mod test {
                 .unwrap()
                 .into(),
             ),
+            result
         );
     }
 }