Apply suggestions from review

threema-ch · May 14, 2024 · 6f96377 · 6f96377
1 parent f36f925
commit 6f96377
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -14,7 +14,7 @@ pub enum PushRelayError {
     #[error("Reqwest error: {0}")]
     Reqwest(#[from] ReqwestError),
 
-    #[error("{reason}: {source}")]
+    #[error("I/O error: {reason}: {source}")]
     IoError {
         reason: &'static str,
         source: std::io::Error,

diff --git a/src/http_client.rs b/src/http_client.rs
@@ -10,7 +10,7 @@ pub fn make_client(pool_idle_timeout_seconds: u64) -> Result<Client, Error> {
         .pool_idle_timeout(Duration::from_secs(pool_idle_timeout_seconds))
         .http1_only()
         .use_rustls_tls()
-        .https_only(false)
-        .tls_built_in_root_certs(true)
+        .https_only(!cfg!(test))
+        .tls_built_in_native_certs(true)
         .build()
 }
diff --git a/src/influxdb.rs b/src/influxdb.rs
@@ -92,10 +92,7 @@ impl Influxdb {
         }
     }
 
-    async fn log<B>(&self, body: B) -> InfluxdbResult
-    where
-        B: Into<Body>,
-    {
+    async fn log(&self, body: impl Into<Body>) -> InfluxdbResult {
         let body: Body = body.into();
 
         // Send request

diff --git a/src/push/hms.rs b/src/push/hms.rs
@@ -42,7 +42,7 @@ pub struct HmsStateConfig {
 type SharedHmsConfig = Arc<HmsStateConfig>;
 
 impl HmsStateConfig {
-    pub fn new() -> SharedHmsConfig {
+    pub fn new_shared() -> SharedHmsConfig {
         let login_endpoint = Cow::Borrowed("https://oauth-login.cloud.huawei.com");
         let push_endpoint = Cow::Borrowed("https://push-api.cloud.huawei.com");
         Arc::new(Self {

diff --git a/src/server.rs b/src/server.rs
@@ -141,7 +141,7 @@ pub async fn serve(
         apns_client_prod: apns_client_prod.clone(),
         apns_client_sbox: apns_client_sbox.clone(),
         hms_contexts: hms_contexts.clone(),
-        hms_config: HmsStateConfig::new(),
+        hms_config: HmsStateConfig::new_shared(),
         threema_gateway_client: threema_gateway_client.clone(),
         threema_gateway_private_key: threema_gateway_private_key.clone(),
         threema_gateway_config: threema_gateway.clone(),