server: Reformat integration test imports

server/svix-server/tests/it/db.rs

@@ -16,7 +16,7 @@ use svix_server::{
 
 use crate::utils::{
     common_calls::{create_test_app, create_test_endpoint, create_test_message, event_type_in},
-    {get_default_test_config, start_svix_server_with_cfg_and_org_id},
+    get_default_test_config, start_svix_server_with_cfg_and_org_id,
 };
 
 async fn test_data() -> (OrganizationId, Vec<ApplicationId>, Vec<EndpointId>) {

server/svix-server/tests/it/e2e_application.rs

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: MIT
 
 use reqwest::StatusCode;
-use svix_server::core::security::generate_org_token;
-use svix_server::core::types::{BaseId, OrganizationId};
 use svix_server::{
-    cfg::CacheType, core::types::ApplicationUid, v1::endpoints::application::ApplicationIn,
-    v1::endpoints::application::ApplicationOut,
+    cfg::CacheType,
+    core::{
+        security::generate_org_token,
+        types::{ApplicationUid, BaseId, OrganizationId},
+    },
+    v1::endpoints::application::{ApplicationIn, ApplicationOut},
 };
 
 use crate::utils::{

server/svix-server/tests/it/e2e_attempt.rs

@@ -1,8 +1,9 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
-use reqwest::StatusCode;
+use std::time::Duration;
 
+use reqwest::StatusCode;
 use svix_server::{
     core::types::{EndpointUid, MessageStatus},
     v1::{
@@ -23,8 +24,6 @@ use crate::utils::{
     IgnoredResponse, TestReceiver,
 };
 
-use std::time::Duration;
-
 #[tokio::test]
 async fn test_expunge_attempt_response_body() {
     let (client, _jh) = start_svix_server().await;

server/svix-server/tests/it/e2e_auth.rs

@@ -3,7 +3,6 @@
 //! from the endpoint is valid in the process.
 
 use reqwest::StatusCode;
-
 use serde_json::Value;
 use svix_server::{
     core::{
@@ -15,11 +14,9 @@ use svix_server::{
 
 use crate::utils::{
     common_calls::{app_portal_access, application_in},
-    start_svix_server, IgnoredResponse,
+    get_default_test_config, start_svix_server, IgnoredResponse,
 };
 
-use crate::utils::get_default_test_config;
-
 #[tokio::test]
 /// Users with application-level tokens should only be allowed to read the information related to
 /// their one application. All other endpoints should error.

server/svix-server/tests/it/e2e_endpoint.rs

@@ -1,6 +1,12 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+    time::Duration,
+};
+
 use anyhow::Result;
 use chrono::{DateTime, Utc};
 use ed25519_compact::Signature;
@@ -9,38 +15,28 @@ use sea_orm::{
     ActiveModelBehavior, ActiveModelTrait, ConnectionTrait, DatabaseBackend, QueryResult, Set,
     Statement,
 };
-use std::sync::Arc;
-use std::{
-    collections::{HashMap, HashSet},
-    time::Duration,
-};
-use svix_server::db::models::{message, messagedestination};
-use svix_server::v1::endpoints::endpoint::EndpointStatsOut;
-use svix_server::v1::endpoints::message::RawPayload;
-
 use serde::Deserialize;
 use svix::webhooks::Webhook;
-use svix_server::cfg::DefaultSignatureType;
-use svix_server::core::types::{
-    BaseId, EndpointId, MessageEndpointId, MessageId, MessageStatus, OrganizationId,
-};
 use svix_server::{
+    cfg::DefaultSignatureType,
     core::{
         cryptography::{AsymmetricKey, Encryption},
         types::{
-            ApplicationId, EndpointHeaders, EndpointHeadersPatch, EndpointSecret,
-            EndpointSecretInternal, EndpointUid, EventChannel, EventChannelSet, EventTypeName,
-            EventTypeNameSet, ExpiringSigningKeys,
+            ApplicationId, BaseId, EndpointHeaders, EndpointHeadersPatch, EndpointId,
+            EndpointSecret, EndpointSecretInternal, EndpointUid, EventChannel, EventChannelSet,
+            EventTypeName, EventTypeNameSet, ExpiringSigningKeys, MessageEndpointId, MessageId,
+            MessageStatus, OrganizationId,
         },
     },
+    db::models::{message, messagedestination},
     v1::{
         endpoints::{
             endpoint::{
                 EndpointHeadersIn, EndpointHeadersOut, EndpointHeadersPatchIn, EndpointIn,
-                EndpointOut, EndpointSecretOut, RecoverIn,
+                EndpointOut, EndpointSecretOut, EndpointStatsOut, RecoverIn,
             },
             event_type::EventTypeOut,
-            message::{MessageIn, MessageOut},
+            message::{MessageIn, MessageOut, RawPayload},
         },
         utils::ListResponse,
     },

server/svix-server/tests/it/e2e_event_type.rs

@@ -4,7 +4,6 @@
 use std::collections::HashSet;
 
 use reqwest::StatusCode;
-
 use svix_server::{
     core::types::{ApplicationId, EventTypeName, FeatureFlag, FeatureFlagSet},
     db::models::eventtype::Schema,

server/svix-server/tests/it/e2e_message.rs

@@ -4,13 +4,14 @@
 use chrono::{Duration, Utc};
 use reqwest::StatusCode;
 use sea_orm::{sea_query::Expr, ColumnTrait, EntityTrait, QueryFilter};
-
 use svix_server::{
     db::models::messagecontent,
     expired_message_cleaner,
     v1::{
-        endpoints::attempt::MessageAttemptOut,
-        endpoints::message::{MessageOut, RawPayload},
+        endpoints::{
+            attempt::MessageAttemptOut,
+            message::{MessageOut, RawPayload},
+        },
         utils::ListResponse,
     },
 };

server/svix-server/tests/it/e2e_operational_webhooks.rs

@@ -5,7 +5,6 @@ use std::{net::TcpListener, sync::Arc, time::Duration};
 
 use chrono::{DateTime, Utc};
 use http::StatusCode;
-
 use reqwest::Url;
 use serde::Deserialize;
 use svix::api::EventTypeOut;
@@ -26,12 +25,12 @@ use svix_server::{
 };
 
 use crate::utils::{
-    common_calls::{create_test_app, create_test_endpoint, create_test_message},
+    common_calls::{
+        create_test_app, create_test_endpoint, create_test_message, default_test_endpoint,
+    },
     get_default_test_config, IgnoredResponse, TestClient, TestReceiver,
 };
 
-use crate::utils::common_calls::default_test_endpoint;
-
 /// Sent when an endpoint has been automatically disabled after continuous failures.
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]

server/svix-server/tests/it/integ_webhook_http_client.rs

@@ -4,9 +4,8 @@ use axum::extract::State;
 use http::{header::USER_AGENT, HeaderValue, Request, StatusCode, Version};
 use hyper::Body;
 use serde::{Deserialize, Serialize};
-use tokio::sync::mpsc;
-
 use svix_server::core::webhook_http_client::{Error, RequestBuilder, WebhookClient};
+use tokio::sync::mpsc;
 
 pub struct TestReceiver {
     pub uri: String,

server/svix-server/tests/it/utils/common_calls.rs

@@ -6,7 +6,6 @@ use std::{collections::HashSet, time::Duration};
 use anyhow::Result;
 use chrono::{DateTime, Utc};
 use reqwest::{StatusCode, Url};
-
 use serde::{de::DeserializeOwned, Serialize};
 use svix::api::DashboardAccessOut;
 use svix_server::{

server/svix-server/tests/it/utils/mod.rs

@@ -9,10 +9,9 @@ use std::{
 
 use anyhow::{Context, Result};
 use axum::response::IntoResponse;
+use http::HeaderMap;
 use reqwest::{Client, RequestBuilder, StatusCode};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use tokio::sync::mpsc;
-
 use svix_ksuid::KsuidLike;
 use svix_server::{
     cfg::ConfigurationInner,
@@ -22,8 +21,7 @@ use svix_server::{
     },
     setup_tracing,
 };
-
-use http::HeaderMap;
+use tokio::sync::mpsc;
 use tracing::instrument::WithSubscriber;
 
 pub mod common_calls;