File tree Expand file tree Collapse file tree 4 files changed +5
-13
lines changed Expand file tree Collapse file tree 4 files changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -230,7 +230,7 @@ test-dyn-comm: build_release_until build-test-utils
230
230
target/ release/ run-committee -- \
231
231
- -configs test-configs/ c1/ \
232
232
- -committee-id 1 \
233
- - -until 1800 \
233
+ - -until 800 \
234
234
- -required-decrypt-rounds 3 && rm -rf test-configs/ c1
235
235
236
236
# portable calculation of now() + 20s in "%Y-%m-%dT%H:%M:%SZ" format
Original file line number Diff line number Diff line change 116
116
for f in " $config_dir " /node_* .toml; do
117
117
cmd=(target/release/timeboost
118
118
--committee-id 0
119
- --committee " $config_dir /committee.toml"
120
119
--config " $f "
121
120
--until $rounds
122
121
--watchdog-timeout 120)
Original file line number Diff line number Diff line change @@ -60,10 +60,7 @@ async fn main() -> Result<()> {
60
60
. arg ( "--ignore-stamp" ) ;
61
61
62
62
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 ( ) ) ;
67
64
}
68
65
if let Some ( r) = args. required_decrypt_rounds {
69
66
cmd. arg ( "--required-decrypt-rounds" ) . arg ( r. to_string ( ) ) ;
Original file line number Diff line number Diff line change @@ -40,11 +40,6 @@ struct Cli {
40
40
#[ clap( long, default_value_t = true , action = clap:: ArgAction :: Set ) ]
41
41
https_only : bool ,
42
42
43
- /// Path to committee config toml.
44
- #[ cfg( feature = "until" ) ]
45
- #[ clap( long) ]
46
- committee : PathBuf ,
47
-
48
43
/// The until value to use for the committee config.
49
44
#[ cfg( feature = "until" ) ]
50
45
#[ clap( long, default_value_t = 1000 ) ]
@@ -246,9 +241,10 @@ async fn main() -> Result<()> {
246
241
use tokio:: time:: sleep;
247
242
use url:: Url ;
248
243
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 ( ) )
250
246
. await
251
- . with_context ( || format ! ( "failed to read committee config {:?}" , cli . committee ) ) ?;
247
+ . with_context ( || format ! ( "failed to read committee config {:?}" , committee_conf ) ) ?;
252
248
253
249
let handle = {
254
250
let Some ( member) = committee
You can’t perform that action at this time.
0 commit comments