revert: Cancel unnecessary asynchronous trait implementations

0x676e67 · Feb 7, 2024 · d674d11 · d674d11
1 parent 2960a42
commit d674d11
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/crates/openai/src/auth/mod.rs b/crates/openai/src/auth/mod.rs
@@ -492,9 +492,7 @@ impl AuthClientBuilder {
         }));
 
         // Platform Login privider
-        providers.push(Prividers::Platform(PlatformAuthProvider(
-            client.clone(),
-        )));
+        providers.push(Prividers::Platform(PlatformAuthProvider(client.clone())));
 
         AuthClient {
             inner: client,
@@ -542,9 +540,7 @@ impl AuthProvider for Prividers {
             Prividers::Web(provider) => provider.do_revoke_token(refresh_token).await,
             #[cfg(feature = "preauth")]
             Prividers::Apple(provider) => provider.do_revoke_token(refresh_token).await,
-            Prividers::Platform(provider) => {
-                provider.do_revoke_token(refresh_token).await
-            }
+            Prividers::Platform(provider) => provider.do_revoke_token(refresh_token).await,
         }
     }
 
@@ -553,9 +549,7 @@ impl AuthProvider for Prividers {
             Prividers::Web(provider) => provider.do_refresh_token(refresh_token).await,
             #[cfg(feature = "preauth")]
             Prividers::Apple(provider) => provider.do_refresh_token(refresh_token).await,
-            Prividers::Platform(provider) => {
-                provider.do_refresh_token(refresh_token).await
-            }
+            Prividers::Platform(provider) => provider.do_refresh_token(refresh_token).await,
         }
     }
 }
diff --git a/crates/openai/src/serve/middleware/limit.rs b/crates/openai/src/serve/middleware/limit.rs
@@ -15,7 +15,7 @@ pub(crate) async fn limit_middleware<B>(
     next: Next<B>,
 ) -> Result<Response, ResponseError> {
     let addr = socket_addr.ip();
-    match limit.acquire(addr).await {
+    match limit.acquire(addr) {
         Ok(condition) => match condition {
             true => Ok(next.run(request).await),
             false => Err(ResponseError::TooManyRequests(ProxyError::TooManyRequests)),

diff --git a/crates/openai/src/serve/middleware/tokenbucket.rs b/crates/openai/src/serve/middleware/tokenbucket.rs
@@ -8,7 +8,7 @@ use crate::homedir::home_dir;
 use crate::{context, debug, error, now_duration};
 
 pub trait TokenBucket: Send + Sync {
-    async fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool>;
+    fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool>;
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug)]
@@ -68,7 +68,7 @@ impl MemTokenBucket {
 }
 
 impl TokenBucket for MemTokenBucket {
-    async fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
+    fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
         if !self.enable {
             return Ok(true);
         }
@@ -211,7 +211,7 @@ fn clear_expired_buckets_every(db: Arc<Database<'static>>, expired: u32) {
 }
 
 impl TokenBucket for RedisTokenBucket<'_> {
-    async fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
+    fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
         if !self.enable {
             return Ok(true);
         }
@@ -291,10 +291,10 @@ impl From<(Strategy, bool, u32, u32, u32)> for TokenBucketProvider {
 }
 
 impl TokenBucket for TokenBucketProvider {
-    async fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
+    fn acquire(&self, ip: IpAddr) -> anyhow::Result<bool> {
         let condition = match self {
-            Self::Mem(t) => t.acquire(ip).await,
-            Self::ReDB(t) => t.acquire(ip).await,
+            Self::Mem(t) => t.acquire(ip),
+            Self::ReDB(t) => t.acquire(ip),
         };
         Ok(condition?)
     }