diff --git a/Cargo.lock b/Cargo.lock index a93144ff7..35f41ad93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -540,9 +540,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9e8fe95ee2add1537d00467b98bb8928334633eb01dcba7f33fb64769af259" +checksum = "60a4b4ca8473c25d1e760c83c2a49d953197556f82f6feb636004d3b6d6cc4a7" dependencies = [ "cairo-lang-utils", "indoc", @@ -554,9 +554,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1ae47b4918a894b60160fac42e6fbcb5a8c0023dd6c290ba03a1bcdf5a554" +checksum = "5852668d1c6966b34d6e4fe249732769ab9cb2012c201e3889d8119f206760a0" dependencies = [ "anyhow", "cairo-lang-defs", @@ -580,18 +580,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c87b905b74516c33fc7e6d61b5243363ce65133054c30bd9531f47e30ca201" +checksum = "b0644fab571f598547993936918c85f0e89b0bbc15140ca3ea723bff376be07d" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611996d85ec608bfec75d546a5c2ec44f664f4bd2514840a5b369d30a1a8bfdb" +checksum = "7f5f437d75ac25644880458effde562edcac45a888d27f2e497d30c6450fa97d" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -606,9 +606,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d015a0790b1f5de8b22b4b4b60d392c35bed07b7aa9dd22361af2793835cee51" +checksum = "6ec5b44d3eaf50e28e068d163e56b9effcea6afe3625c32dd96418d2d4ebc34c" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -618,9 +618,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c580e56e5857d51b6bf2ec5ed5fdd33fd3b74dad7e3cb6d7398396174a6c85" +checksum = "a0cd844e568f51e39729e8ac18bd27ada2e2b6dc9138f8c81adad48456480681" dependencies = [ "cairo-lang-utils", "good_lp", @@ -628,9 +628,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5368e66a742b8532d656171525bfea599490280ceee10bdac93ad60775fc4e59" +checksum = "323a2385e000589f7591f8a46599b4a462db6e36e5935bad3bceddcc1a1608e1" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -643,9 +643,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1200324728e7f4c4acedceee427d9b3ffce221af57e469a454f007cbc248255" +checksum = "1cf9cf637e12d41260dc59f3d988c76a6347424913ac8b6b8449ff3e79b59750" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -664,9 +664,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a7a3069c75e1aca7cf15f20d03baf71f5c86e5be26988f6c25656549aa8b54a" +checksum = "5d71bc5b1f19a00eb662c2cac33259b16b9cdbf9c005047aca0d538c13936407" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -689,7 +689,7 @@ dependencies = [ [[package]] name = "cairo-lang-macro" version = "0.1.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "cairo-lang-macro-attributes", "cairo-lang-macro-stable", @@ -715,9 +715,9 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13b245ddc740ebfed8b05e1bdb7805a06d267cf89d46486c9609306f92d45ce" +checksum = "5d939d258e26ace0f3cb1e50338ae18981a7505e3c20eabd24a62d70ee862d6c" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -735,9 +735,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b656552d0ab4a69be223e42c4e1c4028e512f506a237d04bbe4ccab9a1e13c5" +checksum = "b67a553a6d2d2b54264e77e3c8cb5bc866b40b32d5e2144a58b74c559c7e289f" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cc6adb49faa42ea825e041dff0496c2e72e4ddaf50734062a62383c0c8adbf" +checksum = "c33b5f4502b7efde6ac07fd5468f6dae15d88760aeece3d57a7bc4c224ba693e" dependencies = [ "cairo-lang-debug", "quote", @@ -765,9 +765,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad123ba0e0dd5e1ea80977c0244ff4b0b6d8bf050d42ecb5ff0cf7f885e871f9" +checksum = "b63d6a3cc86a79a29978acaaf6f94738c5487e265247fe06c7bf359645d8c200" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -779,9 +779,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be1227ee50d291f4221f2befab3c107720bd9eb1a4da3783f61481a05ac055e2" +checksum = "528a247ac59cb35b2f99d64605a81de815fa5fb0b0e7f7ece1d4e7fcf267d4ea" dependencies = [ "ark-ff", "ark-secp256k1", @@ -810,9 +810,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d528c79e4ff3e1364569c07e22660ddf60c0d1989705b8f0feed9949962b28a" +checksum = "00c284031fd14796dad91483c3039d7929f8440e1e9e334017744b1d22df5aa8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bdb0c2cc419f45ab7e413322502ca02c2a2c56aeabdd0885e3740f378d8b269" +checksum = "891488c1a3184ce91679f5bdb63015a1d24769a48bd07e5d51a1779d0031dfbe" dependencies = [ "anyhow", "cairo-lang-utils", @@ -863,9 +863,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7224cd827ccf69e742c90a60278876865a96b545a101248d9472d2e02f9190b3" +checksum = "ea7752cd48c86b2cde8603b753a6df4da086dacd16a73d288854d5f040b51171" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -879,9 +879,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e379e3010827fe983e66aa38a0d25fe24cfc11eaf8cadf4dc7bcb31fff031de" +checksum = "340892a09c9421414b2ac45b03c705f16e2bd737e4559dfd98ee1d20718dec9e" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -895,9 +895,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b353930676c06bb885a16ec3b120109aa15539c49f41b3370a5a6314dc29dc" +checksum = "c5cc616e8df44c4d685fe3c5f81f35ebbda57225098b35cea8602457c45c9e96" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -919,9 +919,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83873751d489aae4674f3d755a4897429a664bdc4b0847283e13889f0b0c2a44" +checksum = "1c22ff7e8113a46a907f82f191096c96935cc48247e3079971ddf536ccc2f4f8" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -940,9 +940,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd84b445715326e44832836732b6bda76a119116b296ac9b6b87e2a4177634a" +checksum = "5bf41941776e7410a8853a8e2a116292fc24d219df1989a92ffe5ab0e98037eb" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -950,9 +950,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8df3086f909d27a49d6706be835725df4e21fb50efe699cd763d1f782a31dea" +checksum = "b5508fa5ee8d24adf7d2c65505d0ac35efc892eac16d1449c6f7e314a0288cb8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -980,9 +980,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bcab650779b3431389dc52f1e643a7c9690a1aa2b072c8f01955503d094007" +checksum = "482b8f9d7f8cc7140f1260ee71f3308a66d15bd228a06281067ca3f8f4410db2" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1003,9 +1003,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2dc876ec02a197b8d13dbfc0b2cf7a7e31dcfc6446761cbb85f5b42d589cdc" +checksum = "7db0776c3d06cea65d7afe7a3c7685f6867eb6d951cf505caf35abfd1746773b" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1019,9 +1019,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8727fe3f24ec0834ec6656c70a59f85233439f0a09ca53cf5e27fbdb1b40193" +checksum = "8ce0f7fa01c26cc731bc1d6350ac02fae91a68b5fdf60e684f991e861715adc4" dependencies = [ "genco", "xshell", @@ -1029,9 +1029,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad43180395d6e36bb8c43300c0a0175b67962161370857ce0f4ff1ea91ed7094" +checksum = "74f1597b8229a3649183ff33b19f0aeca5d86505253ebbbce377b271d1732835" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1056,9 +1056,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286da41547de4ffdcfce9ec49528e1f894dc83415bdff3ebaec30cd75b9a2bfa" +checksum = "796770ad15d897d0a6d57d8c7832323e96204f172b1377ab30dcb7c28a75e2fc" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1079,9 +1079,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7681562268173d74b1c8d2438a1d9ec3218c89a8e39a8be3f10e044fa46ebe" +checksum = "630a070a69c387eee9c0eda65e4f2508d129d4fbe081091077e661020ab95637" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e6004780c42bf28ce5afd048cc628b3de34aaf24fd2c228ae73217c58999f9" +checksum = "73104609a7d865e4cd1de9cbf4e750683d076b6d0233bf81be511df274a26916" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -1367,7 +1367,7 @@ dependencies = [ [[package]] name = "create-output-dir" version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "anyhow", "core-foundation 0.10.0", @@ -3560,6 +3560,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minilp" version = "0.2.2" @@ -4410,6 +4420,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -4628,8 +4639,8 @@ dependencies = [ [[package]] name = "scarb" -version = "2.8.1" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +version = "2.8.2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "anyhow", "async-trait", @@ -4679,7 +4690,7 @@ dependencies = [ "reqwest", "scarb-build-metadata", "scarb-metadata", - "scarb-stable-hash 1.0.0 (git+https://github.com/software-mansion/scarb?tag=v2.8.1)", + "scarb-stable-hash 1.0.0 (git+https://github.com/software-mansion/scarb?tag=v2.8.2)", "scarb-ui", "semver", "serde", @@ -4708,8 +4719,8 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.8.1" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +version = "2.8.2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "cargo_metadata", ] @@ -4717,7 +4728,7 @@ dependencies = [ [[package]] name = "scarb-metadata" version = "1.12.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "camino", "derive_builder", @@ -4740,7 +4751,7 @@ dependencies = [ [[package]] name = "scarb-stable-hash" version = "1.0.0" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "data-encoding", "xxhash-rust", @@ -4749,7 +4760,7 @@ dependencies = [ [[package]] name = "scarb-ui" version = "0.1.5" -source = "git+https://github.com/software-mansion/scarb?tag=v2.8.1#b6a1c522345e234419de923e71697f6c1851bff2" +source = "git+https://github.com/software-mansion/scarb?tag=v2.8.2#a37b4cbfc9d7560e4d1375a3b1707c165aedd22a" dependencies = [ "anyhow", "camino", @@ -5682,6 +5693,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" diff --git a/Cargo.toml b/Cargo.toml index 20c7913aa..212af3ce8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,12 +23,12 @@ home = "0.5.3" glob = "0.3.0" # Cairo runner dependencies -cairo-lang-test-runner = "2.8.0" -cairo-lang-test-plugin = "2.8.0" -cairo-lang-runner = "2.8.0" -cairo-lang-sierra = "2.8.0" -scarb = { git = "https://github.com/software-mansion/scarb", tag = "v2.8.1" } -scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.8.1" } +cairo-lang-test-runner = "2.8.2" +cairo-lang-test-plugin = "2.8.2" +cairo-lang-runner = "2.8.2" +cairo-lang-sierra = "2.8.2" +scarb = { git = "https://github.com/software-mansion/scarb", tag = "v2.8.2" } +scarb-ui = { git = "https://github.com/software-mansion/scarb", tag = "v2.8.2" } anyhow = "1.0.66" ark-ff = "0.4.0-alpha.7" diff --git a/runner-crate/Scarb.toml b/runner-crate/Scarb.toml index 4ca173cb6..a1a438437 100644 --- a/runner-crate/Scarb.toml +++ b/runner-crate/Scarb.toml @@ -5,5 +5,7 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.8.0" -cairo_test = "2.8.0" +starknet = "2.8.2" + +[dev-dependencies] +cairo_test = "2.8.2" diff --git a/src/scarb.rs b/src/scarb.rs index 34e67b04e..6abd1e500 100644 --- a/src/scarb.rs +++ b/src/scarb.rs @@ -186,13 +186,12 @@ pub fn scarb_test(file_path: &PathBuf) -> anyhow::Result { } let test_compilation = deserialize_test_compilation(&target_dir, target.name.clone())?; - let config = TestRunConfig { filter: "".into(), include_ignored: false, ignored: false, run_profiler: RunProfilerConfig::None, - gas_enabled: false, + gas_enabled: true, print_resource_usage: false, }; let runner = CompiledTestRunner::new(test_compilation, config);