Improve Katana runner macro (#2464)

Cargo.toml

@@ -29,7 +29,7 @@ members = [
 	"crates/katana/rpc/rpc-types",
 	"crates/katana/rpc/rpc-types-builder",
 	"crates/katana/runner",
-	"crates/katana/runner/runner-macro",
+	"crates/katana/runner/macro",
 	"crates/katana/storage/codecs",
 	"crates/katana/storage/codecs/derive",
 	"crates/katana/storage/db",
@@ -86,6 +86,7 @@ katana-core = { path = "crates/katana/core", default-features = false }
 katana-db = { path = "crates/katana/storage/db" }
 katana-executor = { path = "crates/katana/executor" }
 katana-node = { path = "crates/katana/node", default-features = false }
+katana-node-bindings = { path = "crates/katana/node-bindings" }
 katana-pool = { path = "crates/katana/pool" }
 katana-primitives = { path = "crates/katana/primitives" }
 katana-provider = { path = "crates/katana/storage/provider" }

bin/sozo/src/commands/options/account/mod.rs

@@ -151,6 +151,7 @@ impl AccountOptions {
 #[cfg(test)]
 mod tests {
     use clap::Parser;
+    use katana_runner::RunnerCtx;
     use starknet::accounts::ExecutionEncoder;
     use starknet::core::types::Call;
     use starknet_crypto::Felt;
@@ -211,8 +212,9 @@ mod tests {
         assert!(cmd.account.account_address(None).is_err());
     }
 
-    #[katana_runner::katana_test(2, true)]
-    async fn legacy_flag_works_as_expected() {
+    #[tokio::test]
+    #[katana_runner::test(accounts = 2, fee = false)]
+    async fn legacy_flag_works_as_expected(runner: &RunnerCtx) {
         let cmd = Command::parse_from([
             "sozo",
             "--legacy",
@@ -235,8 +237,9 @@ mod tests {
         assert!(*result.get(3).unwrap() == Felt::from_hex("0x0").unwrap());
     }
 
-    #[katana_runner::katana_test(2, true)]
-    async fn without_legacy_flag_works_as_expected() {
+    #[tokio::test]
+    #[katana_runner::test(accounts = 2, fee = false)]
+    async fn without_legacy_flag_works_as_expected(runner: &RunnerCtx) {
         let cmd = Command::parse_from(["sozo", "--account-address", "0x0", "--private-key", "0x1"]);
         let dummy_call = vec![Call {
             to: Felt::from_hex("0x0").unwrap(),

bin/sozo/tests/test_account.rs

@@ -3,6 +3,7 @@ mod utils;
 use std::fs;
 
 use assert_fs::fixture::PathChild;
+use katana_runner::RunnerCtx;
 use sozo_ops::account;
 use starknet::accounts::Account;
 use utils::snapbox::get_snapbox;
@@ -29,8 +30,9 @@ fn test_account_new() {
     assert!(pt.child("account.json").exists());
 }
 
-#[katana_runner::katana_test(1, true)]
-async fn test_account_fetch() {
+#[tokio::test]
+#[katana_runner::test(accounts = 2, fee = false)]
+async fn test_account_fetch(runner: &RunnerCtx) {
     let pt = assert_fs::TempDir::new().unwrap();
 
     account::fetch(

crates/katana/runner/Cargo.toml

@@ -6,11 +6,12 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+katana-node-bindings.workspace = true
+katana-runner-macro = { path = "macro" }
+
 anyhow.workspace = true
 assert_fs.workspace = true
 chrono.workspace = true
-katana-node-bindings = { path = "../node-bindings" }
-runner-macro = { path = "./runner-macro" }
 serde.workspace = true
 serde_json.workspace = true
 starknet.workspace = true

crates/katana/runner/macro/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+edition.workspace = true
+name = "katana-runner-macro"
+version.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+proc-macro = true
+
+[dependencies]
+proc-macro2 = "1.0.86"
+quote = "1.0"
+syn = { version = "2.0", features = [ "fold", "full" ] }
+
+[dev-dependencies]
+starknet.workspace = true