mkconfig accept +20s, run.rs accepts single quoted multi-words

Author: alxiong

Cargo.lock

@@ -210,19 +210,19 @@ test-dyn-comm: build_release_until build-test-utils
                  --parent-chain-id 31337 \
                  --parent-ibox-contract 0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1 \
                  --key-manager-contract 0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35 \
-                 --timestamp `just now-plus-20s` \
+                 --timestamp +18s \
                  --stamp-dir /tmp \
                  --output test-configs/c1" \
     --run   "6:sleep 8" \
     --run   "7:target/release/register \
                  -a threshold-enc-key \
-                 -m attend__SPACE__year__SPACE__erase__SPACE__basket__SPACE__blind__SPACE__adapt__SPACE__stove__SPACE__broccoli__SPACE__isolate__SPACE__unveil__SPACE__acquire__SPACE__category \
+                 -m 'attend year erase basket blind adapt stove broccoli isolate unveil acquire category' \
                  -u http://localhost:8545 \
                  -k 0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35 \
                  -c test-configs/c0/committee.toml" \
     --run   "8:target/release/register \
                  -a new-committee \
-                 -m attend__SPACE__year__SPACE__erase__SPACE__basket__SPACE__blind__SPACE__adapt__SPACE__stove__SPACE__broccoli__SPACE__isolate__SPACE__unveil__SPACE__acquire__SPACE__category \
+                 -m 'attend year erase basket blind adapt stove broccoli isolate unveil acquire category' \
                  -u http://localhost:8545 \
                  -k 0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35 \
                  -c test-configs/c1/committee.toml" \
@@ -235,8 +235,3 @@ test-dyn-comm: build_release_until build-test-utils
       --committee-id 1 \
       --until 800 \
       --required-decrypt-rounds 3 && rm -rf test-configs/c1
-
-# portable calculation of now() + 20s in "%Y-%m-%dT%H:%M:%SZ" format
-[private]
-now-plus-20s:
-  @python3 -c 'from datetime import datetime, timedelta, timezone; print((datetime.now(timezone.utc)+timedelta(seconds=20)).strftime("%Y-%m-%dT%H:%M:%SZ"))'

justfile

@@ -28,7 +28,6 @@ anyhow = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
 rustix = { workspace = true }
-shell-words = "1.1"
 tokio = { workspace = true }
 tracing = { workspace = true }
 # optional

test-utils/Cargo.toml

@@ -1,7 +1,7 @@
 use std::future::pending;
 use std::ops::{Deref, DerefMut};
+use std::process::ExitStatus;
 use std::time::Duration;
-use std::{ffi::OsStr, process::ExitStatus};
 
 use anyhow::{Result, anyhow, bail};
 use clap::Parser;
@@ -51,16 +51,15 @@ async fn main() -> Result<()> {
 
     for commandline in commands {
         if args.verbose {
-            let joined = commandline.args.join(" ");
             if commandline.sync {
-                eprintln!("running command: {joined}");
+                eprintln!("running command: {}", commandline.args)
             } else {
-                eprintln!("spawning command: {joined}");
+                eprintln!("spawning command: {}", commandline.args)
             }
         }
 
-        let mut pg = ProcessGroup::spawn(&commandline.args)?;
         if commandline.sync {
+            let mut pg = ProcessGroup::spawn(commandline.args.split_whitespace())?;
             let status = select! {
                 s = pg.wait()   => s?,
                 _ = term.recv() => return Ok(()),
@@ -70,8 +69,8 @@ async fn main() -> Result<()> {
                 bail!("{:?} failed with {:?}", commandline.args, status.code());
             }
         } else {
+            let mut pg = ProcessGroup::spawn(commandline.args.split_whitespace())?;
             helpers.spawn(async move {
-                let mut pg = ProcessGroup::spawn(&commandline.args)?;
                 let status = pg.wait().await?;
                 Ok(status)
             });
@@ -112,20 +111,15 @@ async fn main() -> Result<()> {
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 struct Commandline {
     prio: u8,
-    args: Vec<String>,
+    args: String,
     sync: bool,
 }
 
 fn parse_command_line(s: &str) -> Result<Commandline> {
     let (p, a) = s.split_once(':').unwrap_or(("0", s));
-    // Replace __SPACE__ with actual spaces, then split like shell would
-    let parts = shell_words::split(a)?
-        .into_iter()
-        .map(|arg| arg.replace("__SPACE__", " "))
-        .collect();
     Ok(Commandline {
         prio: p.parse()?,
-        args: parts,
+        args: a.to_string(),
         sync: true,
     })
 }
@@ -137,14 +131,33 @@ impl ProcessGroup {
     fn spawn<I, S>(it: I) -> Result<Self>
     where
         I: IntoIterator<Item = S>,
-        S: AsRef<OsStr>,
+        S: Into<String> + AsRef<str>,
     {
         let mut args = it.into_iter();
         let exe = args
             .next()
             .ok_or_else(|| anyhow!("invalid command-line args"))?;
-        let mut cmd = Command::new(exe);
-        cmd.args(args);
+        let mut cmd = Command::new(exe.as_ref());
+        let mut buf: Option<Vec<String>> = None;
+        for a in args {
+            if let Some(b) = &mut buf {
+                let mut a = a.into();
+                if a.ends_with("'") {
+                    a.pop();
+                    b.push(a);
+                    cmd.arg(b.join(" "));
+                    buf = None
+                } else {
+                    b.push(a);
+                }
+            } else if a.as_ref().starts_with("'") {
+                let mut a = a.into();
+                a.remove(0);
+                buf = Some(vec![a]);
+            } else {
+                cmd.arg(a.as_ref());
+            }
+        }
         cmd.process_group(0);
         let child = cmd.spawn()?;
         let id = child.id().ok_or_else(|| anyhow!("child already exited"))?;

test-utils/src/binaries/run.rs

@@ -3,12 +3,14 @@ use std::io::Write;
 use std::net::IpAddr;
 use std::num::NonZeroU8;
 use std::path::PathBuf;
+use std::str::FromStr;
 
 use alloy::eips::BlockNumberOrTag;
 use anyhow::{Result, bail};
 use ark_std::rand::SeedableRng as _;
 use clap::{Parser, ValueEnum};
 use cliquenet::Address;
+use jiff::{SignedDuration, Timestamp};
 use multisig::x25519;
 use secp256k1::rand::SeedableRng as _;
 use timeboost_config::{ChainConfig, ParentChain};
@@ -38,7 +40,7 @@ struct Args {
     /// The timestamp format corresponds to RFC 3339, section 5.6, for example:
     /// 1970-01-01T18:00:00Z.
     #[clap(long)]
-    timestamp: jiff::Timestamp,
+    timestamp: TimestampOrOffset,
 
     /// The sailfish network address. Decrypter, certifier, and internal address are derived:
     /// sharing the same IP as the sailfish IP, and a different (but fixed) port number.
@@ -108,6 +110,23 @@ struct Args {
     output: PathBuf,
 }
 
+#[derive(Debug, Clone)]
+struct TimestampOrOffset(Timestamp);
+
+impl FromStr for TimestampOrOffset {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if let Ok(ts) = Timestamp::from_str(s) {
+            Ok(Self(ts))
+        } else if let Ok(dur) = s.parse::<SignedDuration>() {
+            Ok(Self(Timestamp::now() + dur))
+        } else {
+            Err("Expected RFC3339 timestamp or [+/-]duration".into())
+        }
+    }
+}
+
 /// How should addresses be updated?
 #[derive(Clone, Copy, Debug, Default, ValueEnum)]
 enum Mode {
@@ -216,7 +235,7 @@ impl Args {
         }
 
         let committee_config = CommitteeConfig {
-            effective_timestamp: self.timestamp,
+            effective_timestamp: self.timestamp.0,
             members,
         };
         committee_config_file.write_all(toml::to_string_pretty(&committee_config)?.as_bytes())?;

timeboost-config/src/binaries/mkconfig.rs

@@ -42,10 +42,9 @@ struct Args {
 }
 
 /// Specific register action
-#[derive(Clone, Copy, Debug, Default, ValueEnum)]
+#[derive(Clone, Copy, Debug, ValueEnum)]
 enum Action {
     /// register the next committee
-    #[default]
     NewCommittee,
     /// register the threshold encryption key (when ready)
     ThresholdEncKey,