From d7c1d4166ab89f1d3ed81ab9aec9467eef260b7b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 4 Mar 2021 14:31:28 -0500
Subject: [PATCH] Avoid unwrap() in dirmgr.

---
 tor-dirmgr/src/retry.rs   | 2 +-
 tor-dirmgr/src/updater.rs | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tor-dirmgr/src/retry.rs b/tor-dirmgr/src/retry.rs
index 6cdaa9196..bb72e347d 100644
--- a/tor-dirmgr/src/retry.rs
+++ b/tor-dirmgr/src/retry.rs
@@ -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),
         }
     }
diff --git a/tor-dirmgr/src/updater.rs b/tor-dirmgr/src/updater.rs
index ff0157455..44419a15f 100644
--- a/tor-dirmgr/src/updater.rs
+++ b/tor-dirmgr/src/updater.rs
@@ -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