changes from ismail's comments + remove header time check

informalsystems · Jul 23, 2020 · 68188bc · 68188bc
1 parent d51a025
commit 68188bc
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/light-client/src/predicates.rs b/light-client/src/predicates.rs
@@ -98,20 +98,11 @@ pub trait VerificationPredicates: Send {
     /// Check that the trusted header is within the trusting period, adjusting for clock drift.
     fn is_within_trust_period(
         &self,
-        header: &Header,
+        trusted_header: &Header,
         trusting_period: Duration,
-        clock_drift: Duration,
         now: Time,
     ) -> Result<(), VerificationError> {
-        ensure!(
-            header.time < now + clock_drift,
-            VerificationError::HeaderFromTheFuture {
-                header_time: header.time,
-                now
-            }
-        );
-
-        let expires_at = header.time + trusting_period;
+        let expires_at = trusted_header.time + trusting_period;
         ensure!(
             expires_at > now,
             VerificationError::NotWithinTrustPeriod { expires_at, now }
@@ -123,14 +114,14 @@ pub trait VerificationPredicates: Send {
     /// Check that the untrusted header is from past.
     fn is_header_from_past(
         &self,
-        header: &Header,
+        untrusted_header: &Header,
         clock_drift: Duration,
         now: Time,
     ) -> Result<(), VerificationError> {
         ensure!(
-            header.time < now + clock_drift,
+            untrusted_header.time < now + clock_drift,
             VerificationError::HeaderFromTheFuture {
-                header_time: header.time,
+                header_time: untrusted_header.time,
                 now
             }
         );
@@ -245,7 +236,6 @@ pub fn verify(
     vp.is_within_trust_period(
         &trusted.signed_header.header,
         options.trusting_period,
-        options.clock_drift,
         now,
     )?;