refactor: rename middlewares

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/service/src/middleware.rs

@@ -1,23 +1,23 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
+mod allocation;
 mod attestation;
+mod attestation_signer;
 pub mod auth;
-mod inject_allocation;
-mod inject_attestation_signer;
-mod inject_context;
-mod inject_deployment;
-mod inject_labels;
-mod inject_receipt;
-mod inject_sender;
+mod deployment;
+mod labels;
 mod prometheus_metrics;
+mod sender;
+mod tap_context;
+mod tap_receipt;
 
-pub use inject_allocation::{allocation_middleware, Allocation, AllocationState};
-pub use inject_context::context_middleware;
-pub use inject_deployment::deployment_middleware;
-pub use inject_labels::labels_middleware;
-pub use inject_receipt::receipt_middleware;
-pub use inject_sender::{sender_middleware, SenderState};
-pub use inject_attestation_signer::{signer_middleware, AttestationState};
+pub use allocation::{allocation_middleware, Allocation, AllocationState};
 pub use attestation::{attestation_middleware, AttestationInput};
+pub use attestation_signer::{signer_middleware, AttestationState};
+pub use deployment::deployment_middleware;
+pub use labels::labels_middleware;
 pub use prometheus_metrics::PrometheusMetricsMiddlewareLayer;
+pub use sender::{sender_middleware, SenderState};
+pub use tap_context::context_middleware;
+pub use tap_receipt::receipt_middleware;

crates/service/src/middleware/inject_allocation.rs renamed to crates/service/src/middleware/allocation.rs

@@ -58,7 +58,7 @@ pub async fn allocation_middleware(
 
 #[cfg(test)]
 mod tests {
-    use crate::middleware::inject_allocation::Allocation;
+    use crate::middleware::allocation::Allocation;
 
     use super::{allocation_middleware, AllocationState};
 

crates/service/src/middleware/inject_attestation_signer.rs renamed to crates/service/src/middleware/attestation_signer.rs

@@ -7,8 +7,8 @@ use axum::{extract::Request, middleware::Next, response::Response};
 use thegraph_core::DeploymentId;
 
 use super::{
-    inject_allocation::Allocation,
-    inject_sender::Sender,
+    allocation::Allocation,
+    sender::Sender,
     prometheus_metrics::{MetricLabelProvider, MetricLabels},
 };
 
@@ -81,9 +81,9 @@ pub async fn labels_middleware(mut request: Request, next: Next) -> Response {
 #[cfg(test)]
 mod tests {
     use crate::middleware::{
-        inject_allocation::Allocation,
-        inject_labels::{NO_ALLOCATION, NO_DEPLOYMENT_ID, NO_SENDER},
-        inject_sender::Sender,
+        allocation::Allocation,
+        labels::{NO_ALLOCATION, NO_DEPLOYMENT_ID, NO_SENDER},
+        sender::Sender,
         prometheus_metrics::MetricLabels,
     };
 

crates/service/src/middleware/inject_deployment.rs renamed to crates/service/src/middleware/deployment.rs

@@ -58,7 +58,7 @@ pub async fn sender_middleware(
 
 #[cfg(test)]
 mod tests {
-    use crate::middleware::inject_sender::SenderState;
+    use crate::middleware::sender::SenderState;
 
     use super::{sender_middleware, Sender};
     use alloy::primitives::Address;

crates/service/src/middleware/inject_labels.rs renamed to crates/service/src/middleware/labels.rs

@@ -78,7 +78,7 @@ mod tests {
     use tower::ServiceExt;
 
     use crate::{
-        middleware::inject_context::{context_middleware, QueryBody},
+        middleware::tap_context::{context_middleware, QueryBody},
         tap::AgoraQuery,
     };
 

crates/service/src/middleware/inject_sender.rs renamed to crates/service/src/middleware/sender.rs

@@ -24,7 +24,7 @@ pub async fn receipt_middleware(mut request: Request, next: Next) -> Response {
 
 #[cfg(test)]
 mod tests {
-    use crate::{middleware::inject_receipt::receipt_middleware, service::TapReceipt};
+    use crate::{middleware::tap_receipt::receipt_middleware, service::TapReceipt};
 
     use alloy::primitives::Address;
     use axum::{