fix(cli): simplify world config output

Removed unnecessary unwrap_or pattern in config world output within describe, create, and update commands. Updated schema to reflect NON_NULL world type.
cartridge-gg · Nov 8, 2024 · 5e72541 · 5e72541
1 parent 2d8ea94
commit 5e72541
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/cli/src/command/deployments/create.rs b/cli/src/command/deployments/create.rs
@@ -153,10 +153,7 @@ impl CreateArgs {
             }
             ToriiConfig(config) => {
                 println!("\nConfiguration:");
-                println!(
-                    "  World: {}",
-                    config.world.unwrap_or_else(|| "0x0".to_string())
-                );
+                println!("  World: {}", config.world);
                 println!("  RPC: {}", config.rpc);
                 if let Some(contracts) = config.contracts {
                     println!("  Contracts: {}", contracts);

diff --git a/cli/src/command/deployments/describe.rs b/cli/src/command/deployments/describe.rs
@@ -50,10 +50,7 @@ impl DescribeArgs {
                 ToriiConfig(config) => {
                     println!("\nConfiguration:");
                     println!("  Version: {}", config.version);
-                    println!(
-                        "  World: {}",
-                        config.world.unwrap_or_else(|| "0x0".to_string())
-                    );
+                    println!("  World: {}", config.world);
                     println!("  RPC: {}", config.rpc);
                     if let Some(contracts) = config.contracts {
                         println!("  Contracts: {}", contracts);

diff --git a/cli/src/command/deployments/update.rs b/cli/src/command/deployments/update.rs
@@ -82,10 +82,7 @@ impl UpdateArgs {
         match data.update_deployment {
             ToriiConfig(config) => {
                 println!("\nConfiguration:");
-                println!(
-                    "  World: {}",
-                    config.world.unwrap_or_else(|| "0x0".to_string())
-                );
+                println!("  World: {}", config.world);
                 println!("  RPC: {}", config.rpc);
                 println!("  Start Block: {}", config.start_block.unwrap_or(0));
                 println!("  Index Pending: {}", config.index_pending.unwrap_or(false));

diff --git a/slot/schema.json b/slot/schema.json
@@ -16396,9 +16396,13 @@
               "isDeprecated": false,
               "name": "world",
               "type": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
               }
             },
             {