feat: make xtask spec generation tasks go to stdout when no output is… (#89)

Closes CHAIN-72

Author: devwckd

xtask/src/flags.rs

@@ -61,7 +61,7 @@ xflags::xflags! {
             optional -c, --base-chain-spec base_chain_spec: PathBuf
 
             /// Output file for the chain spec.
-            required -o, --out output: PathBuf
+            optional -o, --out output: PathBuf
 
             repeated --gran gran_keys: String
 
@@ -142,7 +142,7 @@ pub struct Replica {
 #[derive(Debug)]
 pub struct GenerateSpec {
     pub base_chain_spec: Option<PathBuf>,
-    pub out: PathBuf,
+    pub out: Option<PathBuf>,
     pub gran: Vec<String>,
     pub aura: Vec<String>,
     pub balance: Vec<String>,

xtask/src/generate_spec.rs

@@ -37,29 +37,26 @@ pub type Balance = u64;
 pub type Nonce = u32;
 pub type RefCount = u32;
 
-fn generate_replica_spec(gen_replica: flags::GenReplica, out: PathBuf, sudo: Option<String>) {
-    // Create a temporary directory
-    let temp_dir = tempfile::Builder::new()
-        .prefix("torus-replica-spec")
-        .tempdir()
-        .expect("failed to create tempdir")
-        .into_path();
-
+fn generate_replica_spec(
+    gen_replica: flags::GenReplica,
+    out: Option<PathBuf>,
+    sudo: Option<String>,
+) {
     // Create Replica command
     let replica_cmd = flags::Replica {
-        output: Some(out),
+        output: out,
         sudo,
         api_url: gen_replica.api_url.clone(),
     };
 
     // Call the targetchain_spec function
-    targetchain_spec(&replica_cmd, &temp_dir);
+    targetchain_spec(&replica_cmd);
 
     // The file is already written by targetchain_spec, no need to write again
 }
 
 /// Function moved from build_spec.rs
-pub fn targetchain_spec(flags: &flags::Replica, dir: &Path) -> PathBuf {
+pub fn targetchain_spec(flags: &flags::Replica) -> Option<PathBuf> {
     let spec = tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .build()
@@ -78,13 +75,16 @@ pub fn targetchain_spec(flags: &flags::Replica, dir: &Path) -> PathBuf {
 
     let js = serde_json::to_string_pretty(&js).unwrap();
 
-    let chain_path = flags
-        .output
-        .clone()
-        .unwrap_or_else(|| dir.join("spec.json"));
-    std::fs::write(&chain_path, js).unwrap();
-
-    chain_path
+    match &flags.output {
+        Some(chain_path) => {
+            std::fs::write(chain_path, js).unwrap();
+            Some(chain_path.clone())
+        }
+        None => {
+            println!("{js}");
+            None
+        }
+    }
 }
 
 /// Sets the sudo key in the genesis state
@@ -264,9 +264,16 @@ fn generate_new_spec(gen_new: &flags::GenNew, cmd: &flags::GenerateSpec) {
     customize_spec(&mut json, cmd);
 
     // Write the result to the output file
-    let serialized = serde_json::to_vec(&json).expect("failed to generate spec file");
+    let serialized = serde_json::to_string_pretty(&json).expect("failed to generate spec file");
 
-    std::fs::write(&cmd.out, serialized).expect("failed to write resulting spec file");
+    match &cmd.out {
+        Some(output_path) => {
+            std::fs::write(output_path, serialized).expect("failed to write resulting spec file");
+        }
+        None => {
+            println!("{serialized}");
+        }
+    }
 }
 
 // Function to customize a spec file based on the provided flags

xtask/src/run.rs

@@ -47,7 +47,7 @@ pub(super) fn run(mut r: flags::Run) {
         _ => {}
     }
 
-    let (chain_spec, _local_seal) = match &r.subcommand {
+    let (chain_spec, _local_seal) = match &mut r.subcommand {
         flags::RunCmd::Local(local) => {
             let chain_path = local
                 .chain_spec
@@ -65,7 +65,11 @@ pub(super) fn run(mut r: flags::Run) {
             (chain_path, true)
         }
         flags::RunCmd::Replica(replica) => {
-            let chain_path = crate::generate_spec::targetchain_spec(replica, &path);
+            if replica.output.is_none() {
+                replica.output = Some(path.join("spec.json"));
+            }
+
+            let chain_path = crate::generate_spec::targetchain_spec(replica).unwrap();
             let chain_path_str = chain_path.to_str().expect("invalid string").to_string();
             (chain_path_str, false)
         }