diff --git a/src/activity_queue.rs b/src/activity_queue.rs index 88d6342..abb5800 100644 --- a/src/activity_queue.rs +++ b/src/activity_queue.rs @@ -3,10 +3,9 @@ #![doc = include_str!("../docs/09_sending_activities.md")] use crate::{ - activity_sending::{build_tasks, generate_request_headers, SendActivityTask}, + activity_sending::{build_tasks, SendActivityTask}, config::Data, error::Error, - http_signatures::sign_request, traits::{ActivityHandler, Actor}, }; @@ -26,7 +25,7 @@ use tokio::{ sync::mpsc::{unbounded_channel, UnboundedSender}, task::{JoinHandle, JoinSet}, }; -use tracing::{debug, info, warn}; +use tracing::{info, warn}; use url::Url; /// Send a new activity to the given inboxes with automatic retry on failure. Alternatively you @@ -418,16 +417,14 @@ async fn retry>, A: FnMut #[cfg(test)] mod tests { + use super::*; + use crate::http_signatures::generate_actor_keypair; use axum::extract::State; use bytes::Bytes; use http::{HeaderMap, StatusCode}; use std::time::Instant; + use tracing::debug; - use crate::http_signatures::generate_actor_keypair; - - use super::*; - - #[allow(unused)] // This will periodically send back internal errors to test the retry async fn dodgy_handler( State(state): State>, diff --git a/src/activity_sending.rs b/src/activity_sending.rs index d1f8b85..ac38c25 100644 --- a/src/activity_sending.rs +++ b/src/activity_sending.rs @@ -15,10 +15,7 @@ use futures::StreamExt; use httpdate::fmt_http_date; use itertools::Itertools; use openssl::pkey::{PKey, Private}; -use reqwest::{ - header::{HeaderMap, HeaderName, HeaderValue}, - Request, -}; +use reqwest::header::{HeaderMap, HeaderName, HeaderValue}; use reqwest_middleware::ClientWithMiddleware; use serde::Serialize; use std::{ @@ -221,7 +218,8 @@ pub(crate) fn generate_request_headers(inbox_url: &Url) -> HeaderMap { #[cfg(test)] mod tests { - use axum::extract::State; + use super::*; + use crate::{config::FederationConfig, http_signatures::generate_actor_keypair}; use bytes::Bytes; use http::StatusCode; use std::{ @@ -230,23 +228,10 @@ mod tests { }; use tracing::info; - use crate::{config::FederationConfig, http_signatures::generate_actor_keypair}; - - use super::*; - - #[allow(unused)] // This will periodically send back internal errors to test the retry - async fn dodgy_handler( - State(state): State>, - headers: HeaderMap, - body: Bytes, - ) -> Result<(), StatusCode> { + async fn dodgy_handler(headers: HeaderMap, body: Bytes) -> Result<(), StatusCode> { debug!("Headers:{:?}", headers); debug!("Body len:{}", body.len()); - - /*if state.fetch_add(1, Ordering::Relaxed) % 20 == 0 { - return Err(StatusCode::INTERNAL_SERVER_ERROR); - }*/ Ok(()) }