refactor: rework torii CLI to be similar to katana

dojoengine · Nov 10, 2024 · e3a9d49 · e3a9d49
1 parent c6bbcf5
commit e3a9d49
Show file tree

Hide file tree

Showing 7 changed files with 586 additions and 176 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/katana/src/cli/options.rs b/bin/katana/src/cli/options.rs
@@ -63,21 +63,24 @@ pub struct ServerOptions {
     /// HTTP-RPC server listening interface.
     #[arg(long = "http.addr", value_name = "ADDRESS")]
     #[arg(default_value_t = DEFAULT_RPC_ADDR)]
+    #[serde(default = "default_http_addr")]
     pub http_addr: IpAddr,
 
     /// HTTP-RPC server listening port.
     #[arg(long = "http.port", value_name = "PORT")]
     #[arg(default_value_t = DEFAULT_RPC_PORT)]
+    #[serde(default = "default_http_port")]
     pub http_port: u16,
 
     /// Comma separated list of domains from which to accept cross origin requests.
-    #[arg(long = "http.corsdomain")]
+    #[arg(long = "http.cors_origins")]
     #[arg(value_delimiter = ',')]
     pub http_cors_origins: Option<Vec<String>>,
 
     /// Maximum number of concurrent connections allowed.
     #[arg(long = "rpc.max-connections", value_name = "COUNT")]
     #[arg(default_value_t = DEFAULT_RPC_MAX_CONNECTIONS)]
+    #[serde(default = "default_max_connections")]
     pub max_connections: u32,
 }
 
@@ -272,3 +275,15 @@ fn default_validate_max_steps() -> u32 {
 fn default_invoke_max_steps() -> u32 {
     DEFAULT_INVOCATION_MAX_STEPS
 }
+
+fn default_http_addr() -> IpAddr {
+    DEFAULT_RPC_ADDR
+}
+
+fn default_http_port() -> u16 {
+    DEFAULT_RPC_PORT
+}
+
+fn default_max_connections() -> u32 {
+    DEFAULT_RPC_MAX_CONNECTIONS
+}
diff --git a/bin/torii/Cargo.toml b/bin/torii/Cargo.toml
@@ -51,6 +51,7 @@ tempfile.workspace = true
 clap_config = "0.1.1"
 
 [dev-dependencies]
+assert_matches.workspace = true
 camino.workspace = true
 
 [features]