make lease/sleep first class

Author: Ramblurr

scripts/test-timings.edn

@@ -1,34 +1,33 @@
 ;; Auto-generated test timing data for parallel test balancing
-;; Generated: 2026-01-08T07:58:49.883612622Z
-{:ol.clave.account-integration-test 2.082145028,
- :ol.clave.account-test 0.069522587,
- :ol.clave.ari-integration-test 2.785981531,
- :ol.clave.authorization-integration-test 1.78497317,
- :ol.clave.certificate-integration-test 0.512377832,
- :ol.clave.challenge-test 0.019845024,
- :ol.clave.csr-test 0.013935822,
- :ol.clave.errors-test 0.003851314,
- :ol.clave.example.http01-test 0.177178793,
- :ol.clave.impl.ari-test 0.007788492,
- :ol.clave.impl.certificate-test 0.044911591,
- :ol.clave.impl.crypto-test 0.017813106,
- :ol.clave.impl.csr-test 8.70901769,
- :ol.clave.impl.directory-cache-test 0.05401255,
- :ol.clave.impl.http-integration-test 0.202695251,
- :ol.clave.impl.http-test 0.018920438,
- :ol.clave.impl.jws-test 0.02331608,
- :ol.clave.impl.revocation-test 0.007972258,
- :ol.clave.impl.test-util-test 0.198316645,
- :ol.clave.impl.tos-test 9.06953E-4,
- :ol.clave.integration-alternate-test 2.966895851,
- :ol.clave.lease-test 0.115939741,
- :ol.clave.order-helpers-test 0.007209057,
- :ol.clave.order-integration-test 3.016905527,
- :ol.clave.poll-timeout-test 3.448669363,
- :ol.clave.pre-authorization-integration-test 0.194205622,
- :ol.clave.pre-authorization-test 0.002697725,
- :ol.clave.retry-after-integration-test 6.41021729,
- :ol.clave.revocation-integration-test 9.351451987,
- :ol.clave.session-test 0.002804507,
- :ol.clave.storage-test 0.403191988,
- :ol.clave.tos-integration-test 0.210598829}
+;; Generated: 2026-01-08T11:24:51.423181283Z
+{:ol.clave.account-integration-test 1.983294963,
+ :ol.clave.account-test 0.063470671,
+ :ol.clave.ari-integration-test 0.473348341,
+ :ol.clave.authorization-integration-test 7.994090444,
+ :ol.clave.certificate-integration-test 7.891935786,
+ :ol.clave.challenge-test 0.031361698,
+ :ol.clave.csr-test 0.001787287,
+ :ol.clave.errors-test 0.004596504,
+ :ol.clave.example.http01-test 0.145071351,
+ :ol.clave.impl.ari-test 0.01285168,
+ :ol.clave.impl.certificate-test 0.0062301,
+ :ol.clave.impl.crypto-test 0.011109919,
+ :ol.clave.impl.csr-test 7.163367702,
+ :ol.clave.impl.directory-cache-test 0.053972586,
+ :ol.clave.impl.http-integration-test 0.158670867,
+ :ol.clave.impl.http-test 0.005874498,
+ :ol.clave.impl.jws-test 0.085593586,
+ :ol.clave.impl.revocation-test 0.005813402,
+ :ol.clave.impl.test-util-test 0.242684079,
+ :ol.clave.impl.tos-test 0.001343579,
+ :ol.clave.integration-alternate-test 7.519517371,
+ :ol.clave.lease-test 0.114800011,
+ :ol.clave.order-helpers-test 0.005496585,
+ :ol.clave.order-integration-test 4.100246475,
+ :ol.clave.pre-authorization-integration-test 0.228025175,
+ :ol.clave.pre-authorization-test 0.003949582,
+ :ol.clave.retry-after-integration-test 6.154219657,
+ :ol.clave.revocation-integration-test 25.518438303,
+ :ol.clave.session-test 0.002436052,
+ :ol.clave.storage-test 0.956085284,
+ :ol.clave.tos-integration-test 0.085868871}

src/ol/clave/impl/commands.clj

@@ -409,7 +409,7 @@
                     ^java.time.Duration retry (http/retry-after resp fallback)
                     delay-ms (min remaining (.toMillis retry))]
                 (when (pos? delay-ms)
-                  (http/lease-sleep lease delay-ms))
+                  (lease/sleep lease delay-ms))
                 (recur session attempts))))))
       (catch clojure.lang.ExceptionInfo e
         (if (= :lease/deadline-exceeded (:type (ex-data e)))
@@ -540,7 +540,7 @@
                     ^java.time.Duration retry (http/retry-after resp fallback)
                     delay-ms (min remaining (.toMillis retry))]
                 (when (pos? delay-ms)
-                  (http/lease-sleep lease delay-ms))
+                  (lease/sleep lease delay-ms))
                 (recur session attempts))))))
       (catch clojure.lang.ExceptionInfo e
         (if (= :lease/deadline-exceeded (:type (ex-data e)))

src/ol/clave/impl/http.clj

@@ -98,27 +98,6 @@
          (keep (fn [[_ url r]] (when (= r rel) url)))
          vec)))
 
-;; -----------------------------------------------------------------------------
-;; Lease helpers
-;; -----------------------------------------------------------------------------
-
-(defn lease-sleep
-  "Cooperatively wait for `ms` milliseconds or until `lease` ends.
-
-  Returns `:slept` if the full duration elapsed, or `:lease-ended` if the
-  lease was cancelled or timed out during the wait.
-
-  This function is designed for testability - tests can `with-redefs` it to
-  spy on sleep durations (e.g., verifying Retry-After delays).
-  Note: No type hint on ms to allow with-redefs to work."
-  [lease ms]
-  (if (pos? ms)
-    (let [result (deref (lease/done-signal lease) ms :still-active)]
-      (if (= result :still-active)
-        :slept
-        :lease-ended))
-    :slept))
-
 ;; -----------------------------------------------------------------------------
 ;; Retry-After parsing (seconds or HTTP-date)
 ;; -----------------------------------------------------------------------------
@@ -324,7 +303,7 @@
          traffic-calming-ms default-traffic-calming-ms}}]
   (loop [i 0]
     (when (> i 0)
-      (lease-sleep lease traffic-calming-ms))
+      (lease/sleep lease traffic-calming-ms))
     (lease/active?! lease)
     (let [as (:as req)
           {:keys [status headers body-bytes retry? err nonce] :as res}
@@ -439,7 +418,7 @@
          attempt 1
          fivexx 0]
     (when (> attempt 1)
-      (lease-sleep lease default-traffic-calming-ms))
+      (lease/sleep lease default-traffic-calming-ms))
     (lease/active?! lease)
     (let [[session nonce] (get-nonce lease session)
           payload-bytes (jws-encode-json private-key kid nonce endpoint payload)

src/ol/clave/lease.clj

@@ -497,3 +497,16 @@
       (if (pos? nanos-left)
         (Duration/ofNanos nanos-left)
         Duration/ZERO))))
+
+(defn sleep
+  "Cooperatively wait for `ms` milliseconds or until `lease` ends.
+
+  Returns `:slept` if the full duration elapsed, or `:lease-ended` if the
+  lease was cancelled or timed out during the wait."
+  [lease ms]
+  (if (pos? ms)
+    (let [result (deref (done-signal lease) ms :still-active)]
+      (if (= result :still-active)
+        :slept
+        :lease-ended))
+    :slept))

test/ol/clave/retry_after_integration_test.clj

@@ -7,7 +7,6 @@
    [ol.clave.challenge :as challenge]
    [ol.clave.commands :as commands]
    [ol.clave.errors :as errors]
-   [ol.clave.impl.http :as http]
    [ol.clave.impl.pebble-harness :as pebble]
    [ol.clave.impl.test-util :as util]
    [ol.clave.lease :as lease]
@@ -62,7 +61,7 @@
 (deftest poll-authorization-honors-retry-after
   ;; This test forces Pebble to keep an authz in "processing" by hanging the VA HTTP-01 request.
   ;; We assert the VA actually connected to the hanging server to confirm the challenge is in processing.
-  ;; We wrap http/lease-sleep with a spy to record every polling sleep while using a 50ms interval.
+  ;; We wrap lease/sleep with a spy to record every polling sleep while using a 50ms interval.
   ;; We then assert the max sleep is >= ~1s (well above 50ms) to prove Retry-After is honored.
   ;; That proves the polling delay comes from Pebble's Retry-After header in a real E2E flow.
   (testing "poll-authorization uses Retry-After delay from Pebble"
@@ -82,13 +81,13 @@
               ;; Using 1000ms threshold avoids flakiness from timer imprecision.
               min-expected-sleep-ms 1000
               accepted (:accepted hang-server)
-              original-sleep http/lease-sleep
+              original-sleep lease/sleep
               sleep-spy (fn [lease ms]
                           (swap! sleeps conj ms)
                           (original-sleep lease ms))
               [session _challenge] (commands/respond-challenge bg-lease session http-challenge)
               session (commands/set-polling session {:timeout-ms 6000 :interval-ms 50})
-              ex (with-redefs [http/lease-sleep sleep-spy]
+              ex (with-redefs [lease/sleep sleep-spy]
                    (try
                      (commands/poll-authorization bg-lease session authz-url)
                      nil