Move binary crates into a dedicated dir (#1471)

refactor
dojoengine · Jan 23, 2024 · 3620d72 · 3620d72
1 parent 30b900b
commit 3620d72
Show file tree

Hide file tree

Showing 57 changed files with 160 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,16 +2,18 @@
 resolver = "2"
 
 members = [
+  "bin/dojo-language-server",
+  "bin/katana",
+  "bin/sozo",
+  "bin/torii",
   "crates/benches",
   "crates/dojo-bindgen",
   "crates/dojo-core",
   "crates/dojo-lang",
-  "crates/dojo-language-server",
   "crates/dojo-test-utils",
   "crates/dojo-types",
   "crates/dojo-world",
   "crates/dojo-world/abigen",
-  "crates/katana",
   "crates/katana/core",
   "crates/katana/executor",
   "crates/katana/primitives",
@@ -25,7 +27,6 @@ members = [
   "crates/katana/storage/db",
   "crates/katana/storage/provider",
   "crates/metrics",
-  "crates/sozo",
   "crates/sozo/signers",
   "crates/torii/client",
   "crates/torii/server",
@@ -47,6 +48,41 @@ inherits = "release"
 lto = "fat"
 
 [workspace.dependencies]
+# metrics
+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-test-utils = { path = "crates/dojo-test-utils" }
+dojo-types = { path = "crates/dojo-types" }
+dojo-world = { path = "crates/dojo-world" }
+
+# katana
+katana-codecs = { path = "crates/katana/storage/codecs" }
+katana-codecs-derive = { path = "crates/katana/storage/codecs/derive" }
+katana-core = { path = "crates/katana/core" }
+katana-db = { path = "crates/katana/storage/db" }
+katana-executor = { path = "crates/katana/executor" }
+katana-primitives = { path = "crates/katana/primitives" }
+katana-provider = { path = "crates/katana/storage/provider" }
+katana-rpc = { path = "crates/katana/rpc/rpc" }
+katana-rpc-api = { path = "crates/katana/rpc/rpc-api" }
+katana-rpc-types = { path = "crates/katana/rpc/rpc-types" }
+katana-rpc-types-builder = { path = "crates/katana/rpc/rpc-types-builder" }
+katana-runner = { path = "crates/katana/runner" }
+
+# torii
+torii-client = { path = "crates/torii/client" }
+torii-core = { path = "crates/torii/core" }
+torii-graphql = { path = "crates/torii/graphql" }
+torii-grpc = { path = "crates/torii/grpc" }
+torii-server = { path = "crates/torii/server" }
+
+# sozo
+sozo-signers = { path = "crates/sozo/signers" }
+
 anyhow = "1.0.75"
 assert_matches = "1.5.0"
 async-trait = "0.1.68"

diff --git a/crates/dojo-language-server/Cargo.toml → bin/dojo-language-server/Cargo.toml b/crates/dojo-language-server/Cargo.toml → bin/dojo-language-server/Cargo.toml
@@ -4,9 +4,6 @@ name = "dojo-language-server"
 version.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[[bin]]
-name = "dojo-language-server"
-path = "src/bin/language_server.rs"
 
 [dependencies]
 anyhow.workspace = true
@@ -19,7 +16,7 @@ cairo-lang-starknet.workspace = true
 cairo-lang-test-plugin.workspace = true
 cairo-lang-utils.workspace = true
 clap.workspace = true
-dojo-lang = { path = "../dojo-lang" }
+dojo-lang.workspace = true
 log = "0.4.14"
 salsa = "0.16.1"
 smol_str.workspace = true

diff --git a/...anguage-server/src/bin/language_server.rs → bin/dojo-language-server/src/main.rs b/...anguage-server/src/bin/language_server.rs → bin/dojo-language-server/src/main.rs
diff --git a/crates/katana/Cargo.toml → bin/katana/Cargo.toml b/crates/katana/Cargo.toml → bin/katana/Cargo.toml
@@ -10,12 +10,12 @@ version.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
 console.workspace = true
-katana-core = { path = "core" }
-katana-primitives = { path = "primitives" }
-katana-rpc = { path = "rpc/rpc" }
-katana-rpc-api = { path = "rpc/rpc-api" }
-metrics = { path = "../metrics" }
+katana-core.workspace = true
+katana-primitives.workspace = true
+katana-rpc-api.workspace = true
+katana-rpc.workspace = true
 metrics-process.workspace = true
+metrics.workspace = true
 serde_json.workspace = true
 starknet_api.workspace = true
 tokio.workspace = true

diff --git a/crates/katana/src/args.rs → bin/katana/src/args.rs b/crates/katana/src/args.rs → bin/katana/src/args.rs
diff --git a/crates/katana/src/main.rs → bin/katana/src/main.rs b/crates/katana/src/main.rs → bin/katana/src/main.rs
diff --git a/crates/sozo/Cargo.toml → bin/sozo/Cargo.toml b/crates/sozo/Cargo.toml → bin/sozo/Cargo.toml
@@ -24,10 +24,10 @@ clap-verbosity-flag = "2.0.1"
 clap.workspace = true
 clap_complete.workspace = true
 console.workspace = true
-dojo-bindgen = { path = "../dojo-bindgen" }
-dojo-lang = { path = "../dojo-lang" }
-dojo-types = { path = "../dojo-types" }
-dojo-world = { path = "../dojo-world", features = [ "contracts", "metadata", "migration" ] }
+dojo-bindgen.workspace = true
+dojo-lang.workspace = true
+dojo-types.workspace = true
+dojo-world = { workspace = true, features = [ "contracts", "metadata", "migration" ] }
 notify = "6.0.1"
 notify-debouncer-mini = "0.3.0"
 scarb-ui.workspace = true
@@ -46,6 +46,6 @@ url.workspace = true
 
 [dev-dependencies]
 assert_fs = "1.0.10"
-dojo-test-utils = { path = "../dojo-test-utils", features = [ "build-examples" ] }
-katana-runner = { path = "../katana/runner" }
+dojo-test-utils = { workspace = true, features = [ "build-examples" ] }
+katana-runner.workspace = true
 snapbox = "0.4.6"
diff --git a/crates/sozo/README.md → bin/sozo/README.md b/crates/sozo/README.md → bin/sozo/README.md
diff --git a/crates/sozo/src/args.rs → bin/sozo/src/args.rs b/crates/sozo/src/args.rs → bin/sozo/src/args.rs
diff --git a/crates/sozo/src/commands/auth.rs → bin/sozo/src/commands/auth.rs b/crates/sozo/src/commands/auth.rs → bin/sozo/src/commands/auth.rs
diff --git a/crates/sozo/src/commands/build.rs → bin/sozo/src/commands/build.rs b/crates/sozo/src/commands/build.rs → bin/sozo/src/commands/build.rs
diff --git a/crates/sozo/src/commands/completions.rs → bin/sozo/src/commands/completions.rs b/crates/sozo/src/commands/completions.rs → bin/sozo/src/commands/completions.rs
diff --git a/crates/sozo/src/commands/dev.rs → bin/sozo/src/commands/dev.rs b/crates/sozo/src/commands/dev.rs → bin/sozo/src/commands/dev.rs
diff --git a/crates/sozo/src/commands/events.rs → bin/sozo/src/commands/events.rs b/crates/sozo/src/commands/events.rs → bin/sozo/src/commands/events.rs
diff --git a/crates/sozo/src/commands/execute.rs → bin/sozo/src/commands/execute.rs b/crates/sozo/src/commands/execute.rs → bin/sozo/src/commands/execute.rs
diff --git a/crates/sozo/src/commands/init.rs → bin/sozo/src/commands/init.rs b/crates/sozo/src/commands/init.rs → bin/sozo/src/commands/init.rs
diff --git a/crates/sozo/src/commands/migrate.rs → bin/sozo/src/commands/migrate.rs b/crates/sozo/src/commands/migrate.rs → bin/sozo/src/commands/migrate.rs
diff --git a/crates/sozo/src/commands/mod.rs → bin/sozo/src/commands/mod.rs b/crates/sozo/src/commands/mod.rs → bin/sozo/src/commands/mod.rs
diff --git a/crates/sozo/src/commands/model.rs → bin/sozo/src/commands/model.rs b/crates/sozo/src/commands/model.rs → bin/sozo/src/commands/model.rs
diff --git a/crates/sozo/src/commands/options/account.rs → bin/sozo/src/commands/options/account.rs b/crates/sozo/src/commands/options/account.rs → bin/sozo/src/commands/options/account.rs
diff --git a/crates/sozo/src/commands/options/mod.rs → bin/sozo/src/commands/options/mod.rs b/crates/sozo/src/commands/options/mod.rs → bin/sozo/src/commands/options/mod.rs
diff --git a/crates/sozo/src/commands/options/starknet.rs → bin/sozo/src/commands/options/starknet.rs b/crates/sozo/src/commands/options/starknet.rs → bin/sozo/src/commands/options/starknet.rs
diff --git a/.../sozo/src/commands/options/transaction.rs → bin/sozo/src/commands/options/transaction.rs b/.../sozo/src/commands/options/transaction.rs → bin/sozo/src/commands/options/transaction.rs
diff --git a/crates/sozo/src/commands/options/world.rs → bin/sozo/src/commands/options/world.rs b/crates/sozo/src/commands/options/world.rs → bin/sozo/src/commands/options/world.rs
diff --git a/crates/sozo/src/commands/register.rs → bin/sozo/src/commands/register.rs b/crates/sozo/src/commands/register.rs → bin/sozo/src/commands/register.rs
diff --git a/crates/sozo/src/commands/test.rs → bin/sozo/src/commands/test.rs b/crates/sozo/src/commands/test.rs → bin/sozo/src/commands/test.rs
diff --git a/crates/sozo/src/lib.rs → bin/sozo/src/lib.rs b/crates/sozo/src/lib.rs → bin/sozo/src/lib.rs
diff --git a/crates/sozo/src/main.rs → bin/sozo/src/main.rs b/crates/sozo/src/main.rs → bin/sozo/src/main.rs
diff --git a/crates/sozo/src/ops/auth.rs → bin/sozo/src/ops/auth.rs b/crates/sozo/src/ops/auth.rs → bin/sozo/src/ops/auth.rs
diff --git a/crates/sozo/src/ops/events.rs → bin/sozo/src/ops/events.rs b/crates/sozo/src/ops/events.rs → bin/sozo/src/ops/events.rs
diff --git a/crates/sozo/src/ops/execute.rs → bin/sozo/src/ops/execute.rs b/crates/sozo/src/ops/execute.rs → bin/sozo/src/ops/execute.rs
diff --git a/.../sozo/src/ops/migration/migration_test.rs → bin/sozo/src/ops/migration/migration_test.rs b/.../sozo/src/ops/migration/migration_test.rs → bin/sozo/src/ops/migration/migration_test.rs
diff --git a/crates/sozo/src/ops/migration/mod.rs → bin/sozo/src/ops/migration/mod.rs b/crates/sozo/src/ops/migration/mod.rs → bin/sozo/src/ops/migration/mod.rs
diff --git a/crates/sozo/src/ops/migration/ui.rs → bin/sozo/src/ops/migration/ui.rs b/crates/sozo/src/ops/migration/ui.rs → bin/sozo/src/ops/migration/ui.rs
diff --git a/crates/sozo/src/ops/mod.rs → bin/sozo/src/ops/mod.rs b/crates/sozo/src/ops/mod.rs → bin/sozo/src/ops/mod.rs
diff --git a/crates/sozo/src/ops/model.rs → bin/sozo/src/ops/model.rs b/crates/sozo/src/ops/model.rs → bin/sozo/src/ops/model.rs
diff --git a/crates/sozo/src/ops/register.rs → bin/sozo/src/ops/register.rs b/crates/sozo/src/ops/register.rs → bin/sozo/src/ops/register.rs
diff --git a/...es/sozo/tests/fixtures/stdout/init.stdout → bin/sozo/tests/fixtures/stdout/init.stdout b/...es/sozo/tests/fixtures/stdout/init.stdout → bin/sozo/tests/fixtures/stdout/init.stdout
diff --git a/...ixtures/stdout/wrong_cairo_version.stdout → ...ixtures/stdout/wrong_cairo_version.stdout b/...ixtures/stdout/wrong_cairo_version.stdout → ...ixtures/stdout/wrong_cairo_version.stdout
diff --git a/crates/sozo/tests/test_build.rs → bin/sozo/tests/test_build.rs b/crates/sozo/tests/test_build.rs → bin/sozo/tests/test_build.rs
diff --git a/...est_data/invalid_cairo_version/Scarb.toml → ...est_data/invalid_cairo_version/Scarb.toml b/...est_data/invalid_cairo_version/Scarb.toml → ...est_data/invalid_cairo_version/Scarb.toml
diff --git a/...test_data/invalid_cairo_version/lib.cairo → ...test_data/invalid_cairo_version/lib.cairo b/...test_data/invalid_cairo_version/lib.cairo → ...test_data/invalid_cairo_version/lib.cairo
diff --git a/...s/sozo/tests/test_data/keystore/test.json → bin/sozo/tests/test_data/keystore/test.json b/...s/sozo/tests/test_data/keystore/test.json → bin/sozo/tests/test_data/keystore/test.json
diff --git a/crates/sozo/tests/test_init.rs → bin/sozo/tests/test_init.rs b/crates/sozo/tests/test_init.rs → bin/sozo/tests/test_init.rs
diff --git a/crates/sozo/tests/utils/mod.rs → bin/sozo/tests/utils/mod.rs b/crates/sozo/tests/utils/mod.rs → bin/sozo/tests/utils/mod.rs
diff --git a/crates/sozo/tests/utils/snapbox.rs → bin/sozo/tests/utils/snapbox.rs b/crates/sozo/tests/utils/snapbox.rs → bin/sozo/tests/utils/snapbox.rs
diff --git a/crates/sozo/tests/utils/stdout.rs → bin/sozo/tests/utils/stdout.rs b/crates/sozo/tests/utils/stdout.rs → bin/sozo/tests/utils/stdout.rs
diff --git a/bin/torii/Cargo.toml b/bin/torii/Cargo.toml
@@ -0,0 +1,53 @@
+[package]
+edition.workspace = true
+name = "torii"
+version.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow.workspace = true
+async-trait.workspace = true
+base64 = "0.21.2"
+camino.workspace = true
+chrono.workspace = true
+clap.workspace = true
+ctrlc = { version = "3.4", features = [ "termination" ] }
+dojo-types.workspace = true
+dojo-world.workspace = true
+either = "1.9.0"
+futures.workspace = true
+http = "0.2.9"
+http-body = "0.4.5"
+hyper-reverse-proxy = { git = "https://github.com/tarrencev/hyper-reverse-proxy" }
+hyper.workspace = true
+indexmap = "1.9.3"
+lazy_static.workspace = true
+metrics-process.workspace = true
+metrics.workspace = true
+scarb.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sqlx.workspace = true
+starknet-crypto.workspace = true
+starknet.workspace = true
+tokio-stream = "0.1.11"
+tokio-util = "0.7.7"
+tokio.workspace = true
+torii-core.workspace = true
+torii-graphql.workspace = true
+torii-grpc = { workspace = true, features = [ "server" ] }
+torii-server.workspace = true
+tower = "0.4.13"
+tower-http = "0.4.4"
+tracing-subscriber.workspace = true
+tracing.workspace = true
+url.workspace = true
+
+[dev-dependencies]
+camino.workspace = true
+
+[features]
+default = [ "jemalloc", "sqlite" ]
+jemalloc = [ "metrics/jemalloc" ]
+sqlite = [ "sqlx/sqlite" ]
diff --git a/bin/torii/README.md b/bin/torii/README.md
@@ -0,0 +1,7 @@
+# `dojoup`
+
+```sh
+curl -L https://install.dojoengine.org | bash
+```
+
+[Documentation](https://book.dojoengine.org/toolchain/torii/overview.html)
diff --git a/crates/torii/server/src/cli.rs → bin/torii/src/main.rs b/crates/torii/server/src/cli.rs → bin/torii/src/main.rs
@@ -10,8 +10,6 @@
 //!   documentation for usage details. This is **not recommended on Windows**. See [here](https://rust-lang.github.io/rfcs/1974-global-allocators.html#jemalloc)
 //!   for more info.
 
-mod proxy;
-
 use std::net::SocketAddr;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -36,12 +34,11 @@ use torii_core::processors::store_transaction::StoreTransactionProcessor;
 use torii_core::simple_broker::SimpleBroker;
 use torii_core::sql::Sql;
 use torii_core::types::Model;
+use torii_server::proxy::Proxy;
 use tracing::info;
 use tracing_subscriber::{fmt, EnvFilter};
 use url::Url;
 
-use crate::proxy::Proxy;
-
 /// Dojo World Indexer
 #[derive(Parser, Debug)]
 #[command(name = "torii", author, version, about, long_about = None)]
@@ -115,7 +112,7 @@ async fn main() -> anyhow::Result<()> {
         .connect_with(options)
         .await?;
 
-    sqlx::migrate!("../migrations").run(&pool).await?;
+    sqlx::migrate!("../../crates/torii/migrations").run(&pool).await?;
 
     let provider: Arc<_> =
         JsonRpcClient::new(HttpTransport::new(format!("http://{}", args.rpc).parse::<Url>()?))

diff --git a/crates/benches/Cargo.toml b/crates/benches/Cargo.toml
@@ -14,6 +14,6 @@ anyhow.workspace = true
 futures.workspace = true
 hex.workspace = true
 lazy_static.workspace = true
-sozo = { path = "../sozo" }
+sozo = { path = "../../bin/sozo" }
 starknet.workspace = true
 tokio.workspace = true
diff --git a/crates/katana/README.md b/crates/katana/README.md
diff --git a/crates/torii/core/Cargo.toml b/crates/torii/core/Cargo.toml
@@ -40,4 +40,4 @@ tracing.workspace = true
 camino.workspace = true
 dojo-test-utils = { path = "../../dojo-test-utils" }
 scarb.workspace = true
-sozo = { path = "../../sozo" }
+sozo = { path = "../../../bin/sozo" }
diff --git a/crates/torii/graphql/Cargo.toml b/crates/torii/graphql/Cargo.toml
@@ -41,6 +41,6 @@ dojo-test-utils = { path = "../../dojo-test-utils", features = [ "build-examples
 dojo-world = { path = "../../dojo-world" }
 scarb.workspace = true
 serial_test = "2.0.0"
-sozo = { path = "../../sozo" }
+sozo = { path = "../../../bin/sozo" }
 starknet-crypto.workspace = true
 starknet.workspace = true
diff --git a/crates/torii/server/Cargo.toml b/crates/torii/server/Cargo.toml
@@ -50,7 +50,3 @@ camino.workspace = true
 default = [ "jemalloc", "sqlite" ]
 jemalloc = [ "metrics/jemalloc" ]
 sqlite = [ "sqlx/sqlite" ]
-
-[[bin]]
-name = "torii"
-path = "src/cli.rs"
diff --git a/crates/torii/server/src/lib.rs b/crates/torii/server/src/lib.rs
@@ -0,0 +1 @@
+pub mod proxy;