vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid unwrap() in dirmgr.

This commit is contained in:
Nick Mathewson 2021-03-04 14:31:28 -05:00
parent 29311b72f6
commit d7c1d4166a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tor-dirmgr/src/retry.rs
View File

@ -128,7 +128,7 @@ pub struct RetryConfig {
impl Default for RetryConfig {
fn default() -> Self {
RetryConfig {
num: 3.try_into().unwrap(),
num: 3.try_into().expect("3 is not 0"),
initial_delay: Duration::from_millis(1000),
}
}

8
tor-dirmgr/src/updater.rs
View File

@ -155,8 +155,12 @@ fn client_download_range(lt: &Lifetime) -> (SystemTime, Duration) {
let valid_after = lt.valid_after();
let fresh_until = lt.fresh_until();
let valid_until = lt.valid_until();
let voting_interval = fresh_until.duration_since(valid_after).unwrap();
let whole_lifetime = valid_until.duration_since(valid_after).unwrap();
let voting_interval = fresh_until
.duration_since(valid_after)
.expect("valid-after must precede fresh-until");
let whole_lifetime = valid_until
.duration_since(valid_after)
.expect("valid-after must precede valid-until");
// From dir-spec:
// "This time is chosen uniformly at random from the interval