Commit 8b2cbbdf authored by Ian Jackson's avatar Ian Jackson
Browse files

tor-netdoc: ns preamble: break out validity_time_range (tidy)

Remove the otiose `preamble` and `timebound_range` bindings again.
parent a49c9c9f
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -165,12 +165,10 @@ pub struct NetworkStatusSignatures {
impl Preamble {
    /// Calculate the validity range (time interval) for this network status document
    pub fn validity_time_range(&self) -> std::ops::Range<SystemTime> {
        let preamble = self;
        let lifetime = preamble.lifetime.clone();
        let delay = preamble.voting_delay.unwrap_or((0, 0));
        let lifetime = self.lifetime.clone();
        let delay = self.voting_delay.unwrap_or((0, 0));
        let dist_interval = time::Duration::from_secs(delay.1.into());
        let starting_time = *lifetime.valid_after - dist_interval;
        let timebound_range = starting_time..*lifetime.valid_until;
        timebound_range
        starting_time..*lifetime.valid_until
    }
}