diff --git a/reddit_api_async/connection.ml b/reddit_api_async/connection.ml index 4053b45d..150e756d 100644 --- a/reddit_api_async/connection.ml +++ b/reddit_api_async/connection.ml @@ -1,8 +1,6 @@ open! Core open! Async -module Rate_limiter' = Rate_limiter open Reddit_api_kernel -module Rate_limiter = Rate_limiter' module Credentials = struct module Password = struct @@ -385,7 +383,6 @@ type t = T : (module T with type t = 't) * 't -> t let sexp_of_t (T ((module T), t)) = T.sexp_of_t t let all_rate_limiters () = - let module Synchronous_rate_limiter = Reddit_api_kernel.Rate_limiter in Synchronous_rate_limiter.combine [ Synchronous_rate_limiter.by_headers ; Synchronous_rate_limiter.with_minimum_delay ~delay:(Time_ns.Span.of_int_ms 100) diff --git a/reddit_api_async/rate_limiter.ml b/reddit_api_async/rate_limiter.ml index da428aa6..b62bf7a9 100644 --- a/reddit_api_async/rate_limiter.ml +++ b/reddit_api_async/rate_limiter.ml @@ -1,6 +1,6 @@ open! Core open! Async -module Synchronous_rate_limiter = Reddit_api_kernel.Rate_limiter +module Synchronous_rate_limiter = Reddit_api_kernel.Synchronous_rate_limiter type t = { mutable state : Synchronous_rate_limiter.t diff --git a/reddit_api_async/rate_limiter.mli b/reddit_api_async/rate_limiter.mli index b22875e1..8de057ac 100644 --- a/reddit_api_async/rate_limiter.mli +++ b/reddit_api_async/rate_limiter.mli @@ -3,7 +3,7 @@ open! Async type t [@@deriving sexp_of] -val of_synchronous : Reddit_api_kernel.Rate_limiter.t -> Time_source.t -> t +val of_synchronous : Reddit_api_kernel.Synchronous_rate_limiter.t -> Time_source.t -> t val permit_request : t -> unit Deferred.t val notify_response : t -> Cohttp.Response.t -> unit val is_ready : t -> bool diff --git a/reddit_api_kernel/reddit_api_kernel.ml b/reddit_api_kernel/reddit_api_kernel.ml index 0f5e2f4c..f5934086 100644 --- a/reddit_api_kernel/reddit_api_kernel.ml +++ b/reddit_api_kernel/reddit_api_kernel.ml @@ -8,7 +8,6 @@ module Listing = Listing module Mod_action = Mod_action module Moderator_report = Moderator_report module Modmail = Modmail -module Rate_limiter = Rate_limiter module Relationship = Relationship module Stylesheet = Stylesheet module Submit_text = Submit_text @@ -16,6 +15,7 @@ module Subreddit_name = Subreddit_name module Subreddit_rules = Subreddit_rules module Subreddit_settings = Subreddit_settings module Subreddit_traffic = Subreddit_traffic +module Synchronous_rate_limiter = Synchronous_rate_limiter module Thing = Thing module Thing_kind = Thing_kind module Uri_with_string_sexp = Uri_with_string_sexp diff --git a/reddit_api_kernel/rate_limiter.ml b/reddit_api_kernel/synchronous_rate_limiter.ml similarity index 100% rename from reddit_api_kernel/rate_limiter.ml rename to reddit_api_kernel/synchronous_rate_limiter.ml diff --git a/reddit_api_kernel/rate_limiter.mli b/reddit_api_kernel/synchronous_rate_limiter.mli similarity index 100% rename from reddit_api_kernel/rate_limiter.mli rename to reddit_api_kernel/synchronous_rate_limiter.mli diff --git a/test/test_rate_limiter.ml b/test/test_rate_limiter.ml index 3c937533..6521c80a 100644 --- a/test/test_rate_limiter.ml +++ b/test/test_rate_limiter.ml @@ -50,7 +50,7 @@ let%expect_test _ = let time_source = Time_source.create ~now:(00 ^: 00) () in let rate_limiter = Reddit_api_async.Rate_limiter.of_synchronous - Reddit_api_kernel.Rate_limiter.by_headers + Reddit_api_kernel.Synchronous_rate_limiter.by_headers (Time_source.read_only time_source) in let print () =