From 4b4860590b01bec8b78bf0b3c9c2086f8b60e7c8 Mon Sep 17 00:00:00 2001
From: bitfl0wer <florian@pro-weber.com>
Date: Mon, 10 Apr 2023 17:30:02 +0200
Subject: [PATCH] remove tests, reformat limit display, rename limit

---
 src/limit.rs | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/limit.rs b/src/limit.rs
index d973c2c..69958c7 100644
--- a/src/limit.rs
+++ b/src/limit.rs
@@ -1,4 +1,4 @@
-use crate::api::{limits::Config, policies::instance::limits::*};
+use crate::api::limits::Config;
 
 use reqwest::{Client, Request};
 use serde_json::from_str;
@@ -18,15 +18,15 @@ impl std::fmt::Display for Limit {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "Limit: {}, Remaining: {}, Reset: {}, Bucket: {}",
-            self.limit, self.remaining, self.reset, self.bucket
+            "Bucket: {}, Limit: {}, Remaining: {}, Reset: {}",
+            self.bucket, self.limit, self.remaining, self.reset
         )
     }
 }
 
 pub struct LimitedRequester {
     http: Client,
-    limit: Vec<Limit>,
+    limits: Vec<Limit>,
     requests: VecDeque<Request>,
 }
 
@@ -37,7 +37,7 @@ impl LimitedRequester {
     /// headers to see if it can find Ratelimit info to update itself.
     pub async fn new(api_url: String) -> Self {
         LimitedRequester {
-            limit: LimitedRequester::check_limits(api_url).await,
+            limits: LimitedRequester::check_limits(api_url).await,
             http: Client::new(),
             requests: VecDeque::new(),
         }
@@ -148,20 +148,3 @@ impl LimitedRequester {
         limit_vector
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use serde_json::from_str;
-
-    use crate::api::limits::Config;
-
-    use super::*;
-
-    #[tokio::test]
-    async fn test_parse_url() {
-        let test_vec = LimitedRequester::check_limits(String::from("http://localhost:3001/")).await;
-        for _limit in test_vec.iter() {
-            println!("{}", _limit);
-        }
-    }
-}