From 06273aab8fb62eb73b3587c2034adb72eacfdb1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Tr=C4=85tnowiecki?= Date: Mon, 1 Jul 2024 22:47:58 +0200 Subject: [PATCH] Update Cairo --- Cargo.lock | 165 ++++++++++++--------------- Cargo.toml | 48 ++++---- scarb/src/compiler/compilers/test.rs | 12 +- 3 files changed, 109 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 990b09a97..06b74796a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,9 +567,8 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e67d781fe3f8a8edfeb308e012b1e1a575bc2f1818e264b98758699602826e5" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-utils", "indoc", @@ -581,9 +580,8 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1b91df87775298a32faca8683da42fafe12bac4bd659755fe8ad0852a2ca65" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-defs", @@ -605,18 +603,16 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d98288c8967adbe12b97d2b6c87db240728899af9f22e0eeb1d8b90262a5d0f" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60176d0dbf4edc0afe75343ef6460e8544b92c298c829ed9a0e04271296438d5" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -631,9 +627,8 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2617a46069a30f6616b3b2ac61f2f84102aadf0a890c361e835ae89ed680bb6c" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -641,11 +636,24 @@ dependencies = [ "itertools 0.12.1", ] +[[package]] +name = "cairo-lang-doc" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" +dependencies = [ + "cairo-lang-defs", + "cairo-lang-formatter", + "cairo-lang-parser", + "cairo-lang-syntax", + "cairo-lang-utils", + "itertools 0.12.1", + "salsa", +] + [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bcca24edb847fc14242ce89e5e942dbca3db7cd8270d44cf4b6296998b8bcc" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-utils", "good_lp", @@ -653,9 +661,8 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e2126b984e05a531cabdf0f8ab7fbdbeb1853202e76784256373b76588f89c" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -667,9 +674,8 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8551db414f1ab22f94a47d5cfb213e3bbd0e096d500990e5e4518d48822dfa" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -688,14 +694,14 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9153551d9ce7f9e73731d99a1fa076116e9eca5f842991971ad3f5242db2dd59" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-compiler", "cairo-lang-defs", "cairo-lang-diagnostics", + "cairo-lang-doc", "cairo-lang-filesystem", "cairo-lang-formatter", "cairo-lang-lowering", @@ -721,9 +727,8 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7820cef63a4f9e3c380b29e1a90b01687e2e36e172ce59c7f7c0888a386a7f" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -770,9 +775,8 @@ version = "1.0.0" [[package]] name = "cairo-lang-parser" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8724e5c3ddf632a61f096d6073b4b94e4b77925cb4ccd5b3e59e738fad0885ec" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -790,9 +794,8 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e27d87f738d77895a5601c3451cfac3c998c45cab75b99b98ae4074369614fc" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -809,9 +812,8 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f8c9a7127bff999715ce632fa1c96fdafecf1ad401b9739d5af530a7b33adf" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "quote", @@ -820,9 +822,8 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4ddd050058e7b08b6de3d7d0160aa9f8dd6c16f2a5b4da6e1429a9e143eb47" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -834,9 +835,8 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d8ba0a0ad648f80cc008aa7f386c3058afbff99284c8accdbecb114b84dc8d" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "ark-ff", "ark-secp256k1", @@ -865,9 +865,8 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd5d4e1531db649593e14cc0f038ceaf0b355b0b538c45874d7fe8b8fef7169" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -892,9 +891,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b56bc9e96b479ae74e30b1004a7599480e3850b5d7a492788036807568eebe" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-utils", @@ -920,9 +918,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c80caa2c4202dfc58bba56e4b0bebc8152dc06f979342aea6c5310566bcfa26d" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -936,9 +933,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebf3d027a5663a47679319cf9aad312cd417a47afb638f34bf83ba2e45944" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -952,9 +948,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd35fc261cc700d02698aa2d95654a0ed9cfb543cb152c618906367f899e1cde" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -977,9 +972,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3af5f65598f90160754c7d9e277ec6eb187b6f4fa018676109666c1f6cb3024" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -998,9 +992,8 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f5b3fab76e649246e17f5c12b584a2e0b729fecafbf23f24b86a8250df8849" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1008,9 +1001,8 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85460aed78bc233a089aeecd27a1ed3d82a2eb079e4b2d7dc62d50ad7326b1a" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1039,9 +1031,8 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167f3754129e279fa1759a990bfec1f8b48d8acee9f1d46862ec5d298d3de171" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1063,9 +1054,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff58f236a630117b382039701cb94186a054a32132149d6ceddf7f5f3ce673b" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1079,9 +1069,8 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654c66a6408f85a1118f37f8f818c61dd1e0f5623901cba7c87b290703285e43" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "genco", "xshell", @@ -1089,9 +1078,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d610489f6aafe615223480f1266eca3106331220871538cab2762ecd6d5babf1" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1117,9 +1105,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce1ce1db5b8ba3561c5df17d82869e9394cad23499394d12794e5449c93f81b" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1140,9 +1127,8 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bcefb85292f9fb18b03f47e2fcc56b3b02945485495c7d75ae2c85e17295c63" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1153,9 +1139,8 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.0-rc.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c6907351815be936e9aad13437604391264067789d4d1e9ef15c099258a08a" +version = "2.6.4" +source = "git+https://github.com/starkware-libs/cairo?rev=eb818679aeb30326c5a5598368d1cfd98538d0d8#eb818679aeb30326c5a5598368d1cfd98538d0d8" dependencies = [ "env_logger", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index e4216790d..ea190b606 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.7.0-rc.0" +version = "2.6.4" edition = "2021" authors = ["Software Mansion "] @@ -35,29 +35,29 @@ anyhow = "1" assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } -cairo-lang-casm = "2.7.0-rc.0" -cairo-lang-compiler = "2.7.0-rc.0" -cairo-lang-debug = "2.7.0-rc.0" -cairo-lang-defs = "2.7.0-rc.0" -cairo-lang-diagnostics = "2.7.0-rc.0" -cairo-lang-filesystem = "2.7.0-rc.0" -cairo-lang-formatter = "2.7.0-rc.0" -cairo-lang-language-server = "2.7.0-rc.0" -cairo-lang-lowering = "2.7.0-rc.0" -cairo-lang-parser = "2.7.0-rc.0" -cairo-lang-project = "2.7.0-rc.0" -cairo-lang-runner = "2.7.0-rc.0" -cairo-lang-semantic = "2.7.0-rc.0" -cairo-lang-sierra = "2.7.0-rc.0" -cairo-lang-sierra-generator = "2.7.0-rc.0" -cairo-lang-sierra-to-casm = "2.7.0-rc.0" -cairo-lang-sierra-type-size = "2.7.0-rc.0" -cairo-lang-starknet = "2.7.0-rc.0" -cairo-lang-starknet-classes = "2.7.0-rc.0" -cairo-lang-syntax = "2.7.0-rc.0" -cairo-lang-test-plugin = "2.7.0-rc.0" -cairo-lang-test-runner = "2.7.0-rc.0" -cairo-lang-utils = { version = "2.7.0-rc.0", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "eb818679aeb30326c5a5598368d1cfd98538d0d8", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/scarb/src/compiler/compilers/test.rs b/scarb/src/compiler/compilers/test.rs index 2f79d8602..cb16b2d02 100644 --- a/scarb/src/compiler/compilers/test.rs +++ b/scarb/src/compiler/compilers/test.rs @@ -1,7 +1,7 @@ use anyhow::Result; use cairo_lang_compiler::db::RootDatabase; use cairo_lang_sierra::program::VersionedProgram; -use cairo_lang_test_plugin::compile_test_prepared_db; +use cairo_lang_test_plugin::{compile_test_prepared_db, TestsCompilationConfig}; use tracing::trace_span; use crate::compiler::helpers::{ @@ -40,7 +40,15 @@ impl Compiler for TestCompiler { let test_compilation = { let _ = trace_span!("compile_test").enter(); - compile_test_prepared_db(db, starknet, main_crate_ids, test_crate_ids)? + compile_test_prepared_db( + db, + TestsCompilationConfig { + starknet, + add_statements_functions: false, + }, + main_crate_ids, + test_crate_ids, + )? }; {