Change the naming convention of integration tests

NethermindEth · Nov 28, 2024 · 6590b64 · 6590b64
1 parent fa0279a
commit 6590b64
Show file tree

Hide file tree

Showing 96 changed files with 18 additions and 12 deletions.
diff --git a/...e_builtin_test.starknet_with_keccak.cairo → ..._builtin_test__starknet_with_keccak.cairo b/...e_builtin_test.starknet_with_keccak.cairo → ..._builtin_test__starknet_with_keccak.cairo
diff --git a/.../chained_ec_op.starknet_with_keccak.cairo → ...chained_ec_op__starknet_with_keccak.cairo b/.../chained_ec_op.starknet_with_keccak.cairo → ...chained_ec_op__starknet_with_keccak.cairo
diff --git a/...sts/ecdsa_test.starknet_with_keccak.cairo → ...ts/ecdsa_test__starknet_with_keccak.cairo b/...sts/ecdsa_test.starknet_with_keccak.cairo → ...ts/ecdsa_test__starknet_with_keccak.cairo
diff --git a/...tin_tests/ecop.starknet_with_keccak.cairo → ...in_tests/ecop__starknet_with_keccak.cairo b/...tin_tests/ecop.starknet_with_keccak.cairo → ...in_tests/ecop__starknet_with_keccak.cairo
diff --git a/...ts/keccak_test.starknet_with_keccak.cairo → ...s/keccak_test__starknet_with_keccak.cairo b/...ts/keccak_test.starknet_with_keccak.cairo → ...s/keccak_test__starknet_with_keccak.cairo
diff --git a/...sts/builtin_tests/output_test.small.cairo → ...ts/builtin_tests/output_test__small.cairo b/...sts/builtin_tests/output_test.small.cairo → ...ts/builtin_tests/output_test__small.cairo
diff --git a/...s/builtin_tests/pedersen_test.small.cairo → .../builtin_tests/pedersen_test__small.cairo b/...s/builtin_tests/pedersen_test.small.cairo → .../builtin_tests/pedersen_test__small.cairo
diff --git a/.../poseidon_test.starknet_with_keccak.cairo → ...poseidon_test__starknet_with_keccak.cairo b/.../poseidon_test.starknet_with_keccak.cairo → ...poseidon_test__starknet_with_keccak.cairo
diff --git a/...sts/builtin_tests/range_check.small.cairo → ...ts/builtin_tests/range_check__small.cairo b/...sts/builtin_tests/range_check.small.cairo → ...ts/builtin_tests/range_check__small.cairo
diff --git a/...on_tests/cairo_1_programs/array_get.cairo → ...s/cairo_1_programs/array_get__small.cairo b/...on_tests/cairo_1_programs/array_get.cairo → ...s/cairo_1_programs/array_get__small.cairo
diff --git a/...tion_tests/cairo_1_programs/bitwise.cairo → ...cairo_1_programs/bitwise__recursive.cairo b/...tion_tests/cairo_1_programs/bitwise.cairo → ...cairo_1_programs/bitwise__recursive.cairo
diff --git a/...ests/cairo_1_programs/ecdsa_recover.cairo → ..._1_programs/ecdsa_recover__starknet.cairo b/...ests/cairo_1_programs/ecdsa_recover.cairo → ..._1_programs/ecdsa_recover__starknet.cairo
diff --git a/...n_tests/cairo_1_programs/enum_match.cairo → .../cairo_1_programs/enum_match__small.cairo b/...n_tests/cairo_1_programs/enum_match.cairo → .../cairo_1_programs/enum_match__small.cairo
diff --git a/...on_tests/cairo_1_programs/factorial.cairo → ...s/cairo_1_programs/factorial__small.cairo b/...on_tests/cairo_1_programs/factorial.cairo → ...s/cairo_1_programs/factorial__small.cairo
diff --git a/...on_tests/cairo_1_programs/felt_dict.cairo → ...s/cairo_1_programs/felt_dict__small.cairo b/...on_tests/cairo_1_programs/felt_dict.cairo → ...s/cairo_1_programs/felt_dict__small.cairo
diff --git a/...s/cairo_1_programs/felt_dict_squash.cairo → ..._1_programs/felt_dict_squash__small.cairo b/...s/cairo_1_programs/felt_dict_squash.cairo → ..._1_programs/felt_dict_squash__small.cairo
diff --git a/...s/cairo_1_programs/nullable_box_vec.cairo → ..._1_programs/nullable_box_vec__small.cairo b/...s/cairo_1_programs/nullable_box_vec.cairo → ..._1_programs/nullable_box_vec__small.cairo
diff --git a/...ests/cairo_1_programs/nullable_dict.cairo → ...iro_1_programs/nullable_dict__small.cairo b/...ests/cairo_1_programs/nullable_dict.cairo → ...iro_1_programs/nullable_dict__small.cairo
diff --git a/integration_tests/cairo_1_programs/ops.cairo → ...n_tests/cairo_1_programs/ops__small.cairo b/integration_tests/cairo_1_programs/ops.cairo → ...n_tests/cairo_1_programs/ops__small.cairo
diff --git a/...s/cairo_1_programs/pedersen_example.cairo → ..._1_programs/pedersen_example__small.cairo b/...s/cairo_1_programs/pedersen_example.cairo → ..._1_programs/pedersen_example__small.cairo
diff --git a/...ion_tests/cairo_1_programs/poseidon.cairo → ...cairo_1_programs/poseidon__starknet.cairo b/...ion_tests/cairo_1_programs/poseidon.cairo → ...cairo_1_programs/poseidon__starknet.cairo
diff --git a/.../cairo_1_programs/poseidon_pedersen.cairo → ...rograms/poseidon_pedersen__starknet.cairo b/.../cairo_1_programs/poseidon_pedersen.cairo → ...rograms/poseidon_pedersen__starknet.cairo
diff --git a/...ration_tests/cairo_1_programs/print.cairo → ...tests/cairo_1_programs/print__small.cairo b/...ration_tests/cairo_1_programs/print.cairo → ...tests/cairo_1_programs/print__small.cairo
diff --git a/...on_tests/cairo_1_programs/recursion.cairo → ...s/cairo_1_programs/recursion__small.cairo b/...on_tests/cairo_1_programs/recursion.cairo → ...s/cairo_1_programs/recursion__small.cairo
diff --git a/...n_tests/cairo_1_programs/tensor_new.cairo → .../cairo_1_programs/tensor_new__small.cairo b/...n_tests/cairo_1_programs/tensor_new.cairo → .../cairo_1_programs/tensor_new__small.cairo
diff --git a/...ero_file_tests/euclidian_algo.small.cairo → ...ro_file_tests/euclidian_algo__small.cairo b/...ero_file_tests/euclidian_algo.small.cairo → ...ro_file_tests/euclidian_algo__small.cairo
diff --git a/...keccak_builtin.starknet_with_keccak.cairo → ...eccak_builtin__starknet_with_keccak.cairo b/...keccak_builtin.starknet_with_keccak.cairo → ...eccak_builtin__starknet_with_keccak.cairo
diff --git a/...airo_zero_file_tests/pointers.small.cairo → ...iro_zero_file_tests/pointers__small.cairo b/...airo_zero_file_tests/pointers.small.cairo → ...iro_zero_file_tests/pointers__small.cairo
diff --git a/...ero_file_tests/pokemon_battle.small.cairo → ...ro_file_tests/pokemon_battle__small.cairo b/...ero_file_tests/pokemon_battle.small.cairo → ...ro_file_tests/pokemon_battle__small.cairo
diff --git a/...zero_file_tests/pyramid_slope.small.cairo → ...ero_file_tests/pyramid_slope__small.cairo b/...zero_file_tests/pyramid_slope.small.cairo → ...ero_file_tests/pyramid_slope__small.cairo
diff --git a/..._zero_file_tests/simple_print.small.cairo → ...zero_file_tests/simple_print__small.cairo b/..._zero_file_tests/simple_print.small.cairo → ...zero_file_tests/simple_print__small.cairo
diff --git a/.../cairo_zero_file_tests/square.small.cairo → ...cairo_zero_file_tests/square__small.cairo b/.../cairo_zero_file_tests/square.small.cairo → ...cairo_zero_file_tests/square__small.cairo
diff --git a/...sts/cairo_zero_file_tests/sum.small.cairo → ...ts/cairo_zero_file_tests/sum__small.cairo b/...sts/cairo_zero_file_tests/sum.small.cairo → ...ts/cairo_zero_file_tests/sum__small.cairo
diff --git a/...ro_hint_tests/assert_250_bits.small.cairo → ...o_hint_tests/assert_250_bits__small.cairo b/...ro_hint_tests/assert_250_bits.small.cairo → ...o_hint_tests/assert_250_bits__small.cairo
diff --git a/.../cairo_zero_hint_tests/bigint.small.cairo → ...cairo_zero_hint_tests/bigint__small.cairo b/.../cairo_zero_hint_tests/bigint.small.cairo → ...cairo_zero_hint_tests/bigint__small.cairo
diff --git a/..._hint_tests/bigint_to_uint256.small.cairo → ...hint_tests/bigint_to_uint256__small.cairo b/..._hint_tests/bigint_to_uint256.small.cairo → ...hint_tests/bigint_to_uint256__small.cairo
diff --git a/...nt_tests/blake.starknet_with_keccak.cairo → ...t_tests/blake__starknet_with_keccak.cairo b/...nt_tests/blake.starknet_with_keccak.cairo → ...t_tests/blake__starknet_with_keccak.cairo
diff --git a/...ke_finalize_v2.starknet_with_keccak.cairo → ...e_finalize_v2__starknet_with_keccak.cairo b/...ke_finalize_v2.starknet_with_keccak.cairo → ...e_finalize_v2__starknet_with_keccak.cairo
diff --git a/...ke_finalize_v3.starknet_with_keccak.cairo → ...e_finalize_v3__starknet_with_keccak.cairo b/...ke_finalize_v3.starknet_with_keccak.cairo → ...e_finalize_v3__starknet_with_keccak.cairo
diff --git a/...eccak_finalize.starknet_with_keccak.cairo → ...ccak_finalize__starknet_with_keccak.cairo b/...eccak_finalize.starknet_with_keccak.cairo → ...ccak_finalize__starknet_with_keccak.cairo
diff --git a/...lock_size_1000.starknet_with_keccak.cairo → ...ock_size_1000__starknet_with_keccak.cairo b/...lock_size_1000.starknet_with_keccak.cairo → ...ock_size_1000__starknet_with_keccak.cairo
diff --git a/...sts/cairo_zero_hint_tests/cmp.small.cairo → ...ts/cairo_zero_hint_tests/cmp__small.cairo b/...sts/cairo_zero_hint_tests/cmp.small.cairo → ...ts/cairo_zero_hint_tests/cmp__small.cairo
diff --git a/...o_hint_tests/compute_slope_v2.small.cairo → ..._hint_tests/compute_slope_v2__small.cairo b/...o_hint_tests/compute_slope_v2.small.cairo → ..._hint_tests/compute_slope_v2__small.cairo
diff --git a/...o_zero_hint_tests/dict_squash.small.cairo → ..._zero_hint_tests/dict_squash__small.cairo b/...o_zero_hint_tests/dict_squash.small.cairo → ..._zero_hint_tests/dict_squash__small.cairo
diff --git a/...iro_zero_hint_tests/div_mod_n.small.cairo → ...ro_zero_hint_tests/div_mod_n__small.cairo b/...iro_zero_hint_tests/div_mod_n.small.cairo → ...ro_zero_hint_tests/div_mod_n__small.cairo
diff --git a/...hint_tests/div_mod_n_plus_one.small.cairo → ...int_tests/div_mod_n_plus_one__small.cairo b/...hint_tests/div_mod_n_plus_one.small.cairo → ...int_tests/div_mod_n_plus_one__small.cairo
diff --git a/...ests/cairo_zero_hint_tests/ec.small.cairo → ...sts/cairo_zero_hint_tests/ec__small.cairo b/...ests/cairo_zero_hint_tests/ec.small.cairo → ...sts/cairo_zero_hint_tests/ec__small.cairo
diff --git a/..._zero_hint_tests/ec_double_v2.small.cairo → ...zero_hint_tests/ec_double_v2__small.cairo b/..._zero_hint_tests/ec_double_v2.small.cairo → ...zero_hint_tests/ec_double_v2__small.cairo
diff --git a/..._zero_hint_tests/ec_double_v4.small.cairo → ...zero_hint_tests/ec_double_v4__small.cairo b/..._zero_hint_tests/ec_double_v4.small.cairo → ...zero_hint_tests/ec_double_v4__small.cairo
diff --git a/...ro_zero_hint_tests/ec_recover.small.cairo → ...o_zero_hint_tests/ec_recover__small.cairo b/...ro_zero_hint_tests/ec_recover.small.cairo → ...o_zero_hint_tests/ec_recover__small.cairo
diff --git a/...ro_zero_hint_tests/ed25519_ec.small.cairo → ...o_zero_hint_tests/ed25519_ec__small.cairo b/...ro_zero_hint_tests/ed25519_ec.small.cairo → ...o_zero_hint_tests/ed25519_ec__small.cairo
diff --git a/...ero_hint_tests/fast_ec_add_V3.small.cairo → ...ro_hint_tests/fast_ec_add_V3__small.cairo b/...ero_hint_tests/fast_ec_add_V3.small.cairo → ...ro_hint_tests/fast_ec_add_V3__small.cairo
diff --git a/..._zero_hint_tests/find_element.small.cairo → ...zero_hint_tests/find_element__small.cairo b/..._zero_hint_tests/find_element.small.cairo → ...zero_hint_tests/find_element__small.cairo
diff --git a/...t_tests/garaga.starknet_with_keccak.cairo → ..._tests/garaga__starknet_with_keccak.cairo b/...t_tests/garaga.starknet_with_keccak.cairo → ..._tests/garaga__starknet_with_keccak.cairo
diff --git a/...o_hint_tests/get_point_from_x.small.cairo → ..._hint_tests/get_point_from_x__small.cairo b/...o_hint_tests/get_point_from_x.small.cairo → ..._hint_tests/get_point_from_x__small.cairo
diff --git a/...ero_hint_tests/highest_bitlen.small.cairo → ...ro_hint_tests/highest_bitlen__small.cairo b/...ero_hint_tests/highest_bitlen.small.cairo → ...ro_hint_tests/highest_bitlen__small.cairo
diff --git a/..._hint_tests/import_secp256R1P.small.cairo → ...hint_tests/import_secp256R1P__small.cairo b/..._hint_tests/import_secp256R1P.small.cairo → ...hint_tests/import_secp256R1P__small.cairo
diff --git a/..._hint_tests/inv_mod_p_uint512.small.cairo → ...hint_tests/inv_mod_p_uint512__small.cairo b/..._hint_tests/inv_mod_p_uint512.small.cairo → ...hint_tests/inv_mod_p_uint512__small.cairo
diff --git a/...o_zero_hint_tests/is_positive.small.cairo → ..._zero_hint_tests/is_positive__small.cairo b/...o_zero_hint_tests/is_positive.small.cairo → ..._zero_hint_tests/is_positive__small.cairo
diff --git a/...ro_hint_tests/is_quad_residue.small.cairo → ...o_hint_tests/is_quad_residue__small.cairo b/...ro_hint_tests/is_quad_residue.small.cairo → ...o_hint_tests/is_quad_residue__small.cairo
diff --git a/...cairo_zero_hint_tests/is_zero.small.cairo → ...airo_zero_hint_tests/is_zero__small.cairo b/...cairo_zero_hint_tests/is_zero.small.cairo → ...airo_zero_hint_tests/is_zero__small.cairo
diff --git a/...t_tests/keccak.starknet_with_keccak.cairo → ..._tests/keccak__starknet_with_keccak.cairo b/...t_tests/keccak.starknet_with_keccak.cairo → ..._tests/keccak__starknet_with_keccak.cairo
diff --git a/...ak_add_uint256.starknet_with_keccak.cairo → ...k_add_uint256__starknet_with_keccak.cairo b/...ak_add_uint256.starknet_with_keccak.cairo → ...k_add_uint256__starknet_with_keccak.cairo
diff --git a/...eccak_uint256s.starknet_with_keccak.cairo → ...ccak_uint256s__starknet_with_keccak.cairo b/...eccak_uint256s.starknet_with_keccak.cairo → ...ccak_uint256s__starknet_with_keccak.cairo
diff --git a/..._hint_tests/normalize_address.small.cairo → ...hint_tests/normalize_address__small.cairo b/..._hint_tests/normalize_address.small.cairo → ...hint_tests/normalize_address__small.cairo
diff --git a/.../packed_sha256.starknet_with_keccak.cairo → ...packed_sha256__starknet_with_keccak.cairo b/.../packed_sha256.starknet_with_keccak.cairo → ...packed_sha256__starknet_with_keccak.cairo
diff --git a/...tests/poseidon.starknet_with_keccak.cairo → ...ests/poseidon__starknet_with_keccak.cairo b/...tests/poseidon.starknet_with_keccak.cairo → ...ests/poseidon__starknet_with_keccak.cairo
diff --git a/...sts/cairo_zero_hint_tests/pow.small.cairo → ...ts/cairo_zero_hint_tests/pow__small.cairo b/...sts/cairo_zero_hint_tests/pow.small.cairo → ...ts/cairo_zero_hint_tests/pow__small.cairo
diff --git a/...ests/recover_y.starknet_with_keccak.cairo → ...sts/recover_y__starknet_with_keccak.cairo b/...ests/recover_y.starknet_with_keccak.cairo → ...sts/recover_y__starknet_with_keccak.cairo
diff --git a/.../cairo_zero_hint_tests/reduce.small.cairo → ...cairo_zero_hint_tests/reduce__small.cairo b/.../cairo_zero_hint_tests/reduce.small.cairo → ...cairo_zero_hint_tests/reduce__small.cairo
diff --git a/...iro_zero_hint_tests/reduce_v1.small.cairo → ...ro_zero_hint_tests/reduce_v1__small.cairo b/...iro_zero_hint_tests/reduce_v1.small.cairo → ...ro_zero_hint_tests/reduce_v1__small.cairo
diff --git a/...int_tests/search_sorted_lower.small.cairo → ...nt_tests/search_sorted_lower__small.cairo b/...int_tests/search_sorted_lower.small.cairo → ...nt_tests/search_sorted_lower__small.cairo
diff --git a/...int_tests/secp256r1_div_mod_n.small.cairo → ...nt_tests/secp256r1_div_mod_n__small.cairo b/...int_tests/secp256r1_div_mod_n.small.cairo → ...nt_tests/secp256r1_div_mod_n__small.cairo
diff --git a/...cairo_zero_hint_tests/set_add.small.cairo → ...airo_zero_hint_tests/set_add__small.cairo b/...cairo_zero_hint_tests/set_add.small.cairo → ...airo_zero_hint_tests/set_add__small.cairo
diff --git a/...t_tests/sha256.starknet_with_keccak.cairo → ..._tests/sha256__starknet_with_keccak.cairo b/...t_tests/sha256.starknet_with_keccak.cairo → ..._tests/sha256__starknet_with_keccak.cairo
diff --git a/...ero_hint_tests/signed_div_rem.small.cairo → ...ro_hint_tests/signed_div_rem__small.cairo b/...ero_hint_tests/signed_div_rem.small.cairo → ...ro_hint_tests/signed_div_rem__small.cairo
diff --git a/...cairo_zero_hint_tests/split64.small.cairo → ...airo_zero_hint_tests/split64__small.cairo b/...cairo_zero_hint_tests/split64.small.cairo → ...airo_zero_hint_tests/split64__small.cairo
diff --git a/...ro_zero_hint_tests/split_felt.small.cairo → ...o_zero_hint_tests/split_felt__small.cairo b/...ro_zero_hint_tests/split_felt.small.cairo → ...o_zero_hint_tests/split_felt__small.cairo
diff --git a/...iro_zero_hint_tests/split_int.small.cairo → ...ro_zero_hint_tests/split_int__small.cairo b/...iro_zero_hint_tests/split_int.small.cairo → ...ro_zero_hint_tests/split_int__small.cairo
diff --git a/...airo_zero_hint_tests/split_xx.small.cairo → ...iro_zero_hint_tests/split_xx__small.cairo b/...airo_zero_hint_tests/split_xx.small.cairo → ...iro_zero_hint_tests/split_xx__small.cairo
diff --git a/...ts/cairo_zero_hint_tests/sqrt.small.cairo → ...s/cairo_zero_hint_tests/sqrt__small.cairo b/...ts/cairo_zero_hint_tests/sqrt.small.cairo → ...s/cairo_zero_hint_tests/sqrt__small.cairo
diff --git a/...o_zero_hint_tests/uint256_add.small.cairo → ..._zero_hint_tests/uint256_add__small.cairo b/...o_zero_hint_tests/uint256_add.small.cairo → ..._zero_hint_tests/uint256_add__small.cairo
diff --git a/...nt_tests/uint256_improvements.small.cairo → ...t_tests/uint256_improvements__small.cairo b/...nt_tests/uint256_improvements.small.cairo → ...t_tests/uint256_improvements__small.cairo
diff --git a/...int_tests/uint256_mul_div_mod.small.cairo → ...nt_tests/uint256_mul_div_mod__small.cairo b/...int_tests/uint256_mul_div_mod.small.cairo → ...nt_tests/uint256_mul_div_mod__small.cairo
diff --git a/...o_hint_tests/uint256_signedNN.small.cairo → ..._hint_tests/uint256_signedNN__small.cairo b/...o_hint_tests/uint256_signedNN.small.cairo → ..._hint_tests/uint256_signedNN__small.cairo
diff --git a/..._zero_hint_tests/uint256_sqrt.small.cairo → ...zero_hint_tests/uint256_sqrt__small.cairo b/..._zero_hint_tests/uint256_sqrt.small.cairo → ...zero_hint_tests/uint256_sqrt__small.cairo
diff --git a/...ests/uint256_unsigned_div_rem.small.cairo → ...sts/uint256_unsigned_div_rem__small.cairo b/...ests/uint256_unsigned_div_rem.small.cairo → ...sts/uint256_unsigned_div_rem__small.cairo
diff --git a/...zero_hint_tests/unsafe_keccak.small.cairo → ...ero_hint_tests/unsafe_keccak__small.cairo b/...zero_hint_tests/unsafe_keccak.small.cairo → ...ero_hint_tests/unsafe_keccak__small.cairo
diff --git a/..._tests/unsafe_keccak_finalize.small.cairo → ...tests/unsafe_keccak_finalize__small.cairo b/..._tests/unsafe_keccak_finalize.small.cairo → ...tests/unsafe_keccak_finalize__small.cairo
diff --git a/...o_hint_tests/unsigned_div_rem.small.cairo → ..._hint_tests/unsigned_div_rem__small.cairo b/...o_hint_tests/unsigned_div_rem.small.cairo → ..._hint_tests/unsigned_div_rem__small.cairo
diff --git a/...s/cairo_zero_hint_tests/usort.small.cairo → .../cairo_zero_hint_tests/usort__small.cairo b/...s/cairo_zero_hint_tests/usort.small.cairo → .../cairo_zero_hint_tests/usort__small.cairo
diff --git a/..._tests/verify_ecdsa_signature.small.cairo → ...tests/verify_ecdsa_signature__small.cairo b/..._tests/verify_ecdsa_signature.small.cairo → ...tests/verify_ecdsa_signature__small.cairo
diff --git a/...o_zero_hint_tests/verify_zero.small.cairo → ..._zero_hint_tests/verify_zero__small.cairo b/...o_zero_hint_tests/verify_zero.small.cairo → ..._zero_hint_tests/verify_zero__small.cairo
diff --git a/...ero_hint_tests/verify_zero_v2.small.cairo → ...ro_hint_tests/verify_zero_v2__small.cairo b/...ero_hint_tests/verify_zero_v2.small.cairo → ...ro_hint_tests/verify_zero_v2__small.cairo
diff --git a/integration_tests/cairozero_test.go b/integration_tests/cairozero_test.go
@@ -64,7 +64,7 @@ func runAndTestFile(t *testing.T, path string, name string, benchmarkMap map[str
 	if zero {
 		rustVmFilePath = compiledOutput
 	}
-	elapsedRs, rsTraceFile, rsMemoryFile, err := runRustVm(name, rustVmFilePath, layout, zero)
+	elapsedRs, rsTraceFile, rsMemoryFile, err := runRustVm(rustVmFilePath, layout, zero)
 	if errorExpected {
 		// we let the code go on so that we can check if the go vm also raises an error
 		assert.Error(t, err, path)
@@ -182,7 +182,7 @@ func TestCairoFiles(t *testing.T) {
 			path := filepath.Join(root.path, name)
 
 			errorExpected := false
-			if name == "range_check.small.cairo" {
+			if name == "range_check__small.cairo" {
 				errorExpected = true
 			}
 			if !filter.filtered(name) {
@@ -377,7 +377,7 @@ func runPythonVm(testFilename, path, layout string) (time.Duration, string, stri
 
 // given a path to a compiled cairo zero file, execute it using the
 // rust vm and return the trace and memory files location
-func runRustVm(testFilename, path, layout string, zero bool) (time.Duration, string, string, error) {
+func runRustVm(path, layout string, zero bool) (time.Duration, string, string, error) {
 	traceOutput := swapExtenstion(path, rsTraceSuffix)
 	memoryOutput := swapExtenstion(path, rsMemorySuffix)
 
@@ -534,23 +534,23 @@ func memoryRepr(memory []*fp.Element) string {
 // The convention would be: ".$layout.cairo"
 // A file without this suffix will use the default ("plain") layout, which is a layout with no builtins included"
 func getLayoutFromFileName(path string) string {
-	if strings.HasSuffix(path, ".small.cairo") {
+	if strings.HasSuffix(path, "__small.cairo") {
 		return "small"
-	} else if strings.HasSuffix(path, ".dex.cairo") {
+	} else if strings.HasSuffix(path, "__dex.cairo") {
 		return "dex"
-	} else if strings.HasSuffix(path, ".recursive.cairo") {
+	} else if strings.HasSuffix(path, "__recursive.cairo") {
 		return "recursive"
-	} else if strings.HasSuffix(path, ".starknet_with_keccak.cairo") {
+	} else if strings.HasSuffix(path, "__starknet_with_keccak.cairo") {
 		return "starknet_with_keccak"
-	} else if strings.HasSuffix(path, ".starknet.cairo") {
+	} else if strings.HasSuffix(path, "__starknet.cairo") {
 		return "starknet"
-	} else if strings.HasSuffix(path, ".recursive_large_output.cairo") {
+	} else if strings.HasSuffix(path, "__recursive_large_output.cairo") {
 		return "recursive_large_output"
-	} else if strings.HasSuffix(path, ".recursive_with_poseidon.cairo") {
+	} else if strings.HasSuffix(path, "__recursive_with_poseidon.cairo") {
 		return "recursive_with_poseidon"
-	} else if strings.HasSuffix(path, ".all_solidity.cairo") {
+	} else if strings.HasSuffix(path, "__all_solidity.cairo") {
 		return "all_solidity"
-	} else if strings.HasSuffix(path, ".all_cairo.cairo") {
+	} else if strings.HasSuffix(path, "__all_cairo.cairo") {
 		return "all_cairo"
 	}
 	return "plain"

diff --git a/integration_tests/script.sh b/integration_tests/script.sh
@@ -0,0 +1,6 @@
+find ./builtin_tests -type f -name "*.small*" -exec sh -c '
+for file do
+    newfile="${file%.small*}__small${file#*.small}"
+    mv "$file" "$newfile"
+done
+' sh {} +