refactor(katana): include config in the node struct (dojoengine#2742)

Cargo.toml

@@ -10,7 +10,9 @@ members = [
 	"bin/torii",
 	"crates/dojo/bindgen",
 	"crates/dojo/core",
+# TODO: to be removed but still used by some tools like LS
 	"crates/dojo/lang",
+	"crates/dojo/macros",
 	"crates/dojo/test-utils",
 	"crates/dojo/types",
 	"crates/dojo/utils",
@@ -82,7 +84,7 @@ dojo-metrics = { path = "crates/metrics" }
 # dojo-lang
 dojo-bindgen = { path = "crates/dojo/bindgen" }
 dojo-core = { path = "crates/dojo/core" }
-dojo-lang = { path = "crates/dojo/lang" }
+dojo-macros = { path = "crates/dojo/macros" }
 dojo-test-utils = { path = "crates/dojo/test-utils" }
 dojo-types = { path = "crates/dojo/types" }
 dojo-world = { path = "crates/dojo/world" }

bin/dojo-language-server/Cargo.toml

@@ -8,4 +8,4 @@ version.workspace = true
 [dependencies]
 cairo-lang-language-server.workspace = true
 clap.workspace = true
-dojo-lang.workspace = true
+dojo-macros.workspace = true

bin/dojo-language-server/src/main.rs

@@ -1,16 +1,10 @@
-use cairo_lang_language_server::Tricks;
 use clap::Parser;
-use dojo_lang::dojo_plugin_suite;
 
 /// Dojo Language Server
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 struct Args {}
 
 fn main() {
-    let _args = Args::parse();
-
-    let mut tricks = Tricks::default();
-    tricks.extra_plugin_suites = Some(&|| vec![dojo_plugin_suite()]);
-    cairo_lang_language_server::start_with_tricks(tricks);
+    cairo_lang_language_server::start();
 }

bin/sozo/Cargo.toml

@@ -23,7 +23,6 @@ clap.workspace = true
 clap-verbosity-flag.workspace = true
 colored.workspace = true
 dojo-bindgen.workspace = true
-dojo-lang.workspace = true
 dojo-types.workspace = true
 dojo-utils.workspace = true
 dojo-world.workspace = true

bin/sozo/src/commands/test.rs

@@ -16,7 +16,6 @@ use cairo_lang_test_plugin::{test_plugin_suite, TestsCompilationConfig};
 use cairo_lang_test_runner::{CompiledTestRunner, RunProfilerConfig, TestCompiler, TestRunConfig};
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
 use clap::Args;
-use dojo_lang::dojo_plugin_suite;
 use itertools::Itertools;
 use scarb::compiler::{
     CairoCompilationUnit, CompilationUnit, CompilationUnitAttributes, ContractSelector,
@@ -197,7 +196,6 @@ pub(crate) fn build_root_database(unit: &CairoCompilationUnit) -> Result<RootDat
     b.with_cfg(CfgSet::from_iter([Cfg::name("test"), Cfg::kv("target", "test")]));
 
     b.with_plugin_suite(test_plugin_suite());
-    b.with_plugin_suite(dojo_plugin_suite());
     b.with_plugin_suite(starknet_plugin_suite());
 
     b.build()

crates/benches/contracts/src/models/character.cairo

@@ -1,4 +1,4 @@
-use starknet::{ContractAddress, get_caller_address};
+use starknet::ContractAddress;
 
 // TODO import all this when complex benchmarks are merged
 #[derive(Introspect, Copy, Drop, Serde)]
@@ -63,4 +63,4 @@ struct Alias {
     #[key]
     player: ContractAddress,
     name: felt252,
-}
+}