Skip to content

Commit 8c10bda

Browse files
committed
minor fix
1 parent 9e56d2f commit 8c10bda

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ test-dyn-comm: build_release_until build-test-utils
230230
target/release/run-committee -- \
231231
--configs test-configs/c1/ \
232232
--committee-id 1 \
233-
--until 1800 \
233+
--until 800 \
234234
--required-decrypt-rounds 3 && rm -rf test-configs/c1
235235

236236
# portable calculation of now() + 20s in "%Y-%m-%dT%H:%M:%SZ" format

scripts/run-timeboost-demo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ i=0
116116
for f in "$config_dir"/node_*.toml; do
117117
cmd=(target/release/timeboost
118118
--committee-id 0
119-
--committee "$config_dir/committee.toml"
120119
--config "$f"
121120
--until $rounds
122121
--watchdog-timeout 120)

test-utils/src/binaries/run-committee.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ async fn main() -> Result<()> {
6060
.arg("--ignore-stamp");
6161

6262
if let Some(until) = args.until {
63-
cmd.arg("--committee")
64-
.arg(format!("{}/committee.toml", args.configs.to_str().unwrap()))
65-
.arg("--until")
66-
.arg(until.to_string());
63+
cmd.arg("--until").arg(until.to_string());
6764
}
6865
if let Some(r) = args.required_decrypt_rounds {
6966
cmd.arg("--required-decrypt-rounds").arg(r.to_string());

timeboost/src/binaries/timeboost.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ struct Cli {
4040
#[clap(long, default_value_t = true, action = clap::ArgAction::Set)]
4141
https_only: bool,
4242

43-
/// Path to committee config toml.
44-
#[cfg(feature = "until")]
45-
#[clap(long)]
46-
committee: PathBuf,
47-
4843
/// The until value to use for the committee config.
4944
#[cfg(feature = "until")]
5045
#[clap(long, default_value_t = 1000)]
@@ -246,9 +241,10 @@ async fn main() -> Result<()> {
246241
use tokio::time::sleep;
247242
use url::Url;
248243

249-
let committee = CommitteeConfig::read(&cli.committee)
244+
let committee_conf = cli.config.with_file_name("committee.toml");
245+
let committee = CommitteeConfig::read(&committee_conf.to_str().unwrap())
250246
.await
251-
.with_context(|| format!("failed to read committee config {:?}", cli.committee))?;
247+
.with_context(|| format!("failed to read committee config {:?}", committee_conf))?;
252248

253249
let handle = {
254250
let Some(member) = committee

0 commit comments

Comments
 (0)