chore: apply rustfmt to interop changes

muscariello · muscariello · commit 6bf76de39b55 · 2026-04-06T20:21:41.000+02:00
Signed-off-by: Luca Muscariello &lt;muscariello@ieee.org&gt;
diff --git a/a2a-client/src/jsonrpc.rs b/a2a-client/src/jsonrpc.rs
@@ -341,7 +341,9 @@ impl Transport for JsonRpcTransport {
         params: &ServiceParams,
         req: &CreateTaskPushNotificationConfigRequest,
     ) -> Result<TaskPushNotificationConfig, A2AError> {
-        let result = self.call_value(params, methods::CREATE_PUSH_CONFIG, req).await?;
+        let result = self
+            .call_value(params, methods::CREATE_PUSH_CONFIG, req)
+            .await?;
         deserialize_task_push_notification_config(result)
     }
 
@@ -350,7 +352,9 @@ impl Transport for JsonRpcTransport {
         params: &ServiceParams,
         req: &GetTaskPushNotificationConfigRequest,
     ) -> Result<TaskPushNotificationConfig, A2AError> {
-        let result = self.call_value(params, methods::GET_PUSH_CONFIG, req).await?;
+        let result = self
+            .call_value(params, methods::GET_PUSH_CONFIG, req)
+            .await?;
         deserialize_task_push_notification_config(result)
     }
 
@@ -359,7 +363,9 @@ impl Transport for JsonRpcTransport {
         params: &ServiceParams,
         req: &ListTaskPushNotificationConfigsRequest,
     ) -> Result<ListTaskPushNotificationConfigsResponse, A2AError> {
-        let result = self.call_value(params, methods::LIST_PUSH_CONFIGS, req).await?;
+        let result = self
+            .call_value(params, methods::LIST_PUSH_CONFIGS, req)
+            .await?;
         deserialize_list_task_push_notification_configs_response(result)
     }
 
diff --git a/a2a-client/src/push_config_compat.rs b/a2a-client/src/push_config_compat.rs
@@ -101,4 +101,4 @@ mod tests {
         assert_eq!(parsed.configs, configs);
         assert_eq!(parsed.next_page_token, None);
     }
-}
+}
diff --git a/a2a-client/src/rest.rs b/a2a-client/src/rest.rs
@@ -393,10 +393,10 @@ impl Transport for RestTransport {
     ) -> Result<TaskPushNotificationConfig, A2AError> {
         let payload = self
             .post_value(
-            &format!("/tasks/{}/pushNotificationConfigs", req.task_id),
-            params,
-            &req.config,
-        )
+                &format!("/tasks/{}/pushNotificationConfigs", req.task_id),
+                params,
+                &req.config,
+            )
             .await?;
         deserialize_task_push_notification_config(payload)
     }
@@ -408,10 +408,10 @@ impl Transport for RestTransport {
     ) -> Result<TaskPushNotificationConfig, A2AError> {
         let payload = self
             .get_value(
-            &format!("/tasks/{}/pushNotificationConfigs/{}", req.task_id, req.id),
-            params,
-            &[],
-        )
+                &format!("/tasks/{}/pushNotificationConfigs/{}", req.task_id, req.id),
+                params,
+                &[],
+            )
             .await?;
         deserialize_task_push_notification_config(payload)
     }
@@ -431,10 +431,10 @@ impl Transport for RestTransport {
 
         let payload = self
             .get_value(
-            &format!("/tasks/{}/pushNotificationConfigs", req.task_id),
-            params,
-            &query_parts,
-        )
+                &format!("/tasks/{}/pushNotificationConfigs", req.task_id),
+                params,
+                &query_parts,
+            )
             .await?;
         deserialize_list_task_push_notification_configs_response(payload)
     }
diff --git a/a2a-server/src/handler.rs b/a2a-server/src/handler.rs
@@ -809,16 +809,16 @@ impl RequestHandler for DefaultRequestHandler {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::executor::ExecutorContext;
+    use crate::push::InMemoryPushConfigStore;
+    use crate::task_store::InMemoryTaskStore;
     use axum::{
         Router,
         body::Bytes,
         extract::State,
         http::{HeaderMap, StatusCode, header},
         routing::post,
     };
-    use crate::executor::ExecutorContext;
-    use crate::push::InMemoryPushConfigStore;
-    use crate::task_store::InMemoryTaskStore;
     use futures::stream;
     use std::sync::Arc;
     use tokio::{
@@ -1052,15 +1052,16 @@ mod tests {
         StatusCode::ACCEPTED
     }
 
-    async fn start_push_webhook(
-    ) -> (
+    async fn start_push_webhook() -> (
         String,
         mpsc::UnboundedReceiver<CapturedPush>,
         oneshot::Sender<()>,
         tokio::task::JoinHandle<()>,
     ) {
         let (sender, receiver) = mpsc::unbounded_channel();
-        let app = Router::new().route("/", post(capture_push)).with_state(sender);
+        let app = Router::new()
+            .route("/", post(capture_push))
+            .with_state(sender);
         let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
         let address = listener.local_addr().unwrap();
         let (shutdown_tx, shutdown_rx) = oneshot::channel();
diff --git a/a2a-server/src/jsonrpc.rs b/a2a-server/src/jsonrpc.rs
@@ -444,7 +444,8 @@ mod tests {
         });
         let resp = post_jsonrpc(app, methods::CREATE_PUSH_CONFIG, params).await;
         assert!(resp.error.is_none(), "unexpected error: {:?}", resp.error);
-        let result = serde_json::from_value::<TaskPushNotificationConfig>(resp.result.unwrap()).unwrap();
+        let result =
+            serde_json::from_value::<TaskPushNotificationConfig>(resp.result.unwrap()).unwrap();
         assert_eq!(result.task_id, "t1");
         assert_eq!(result.config.id.as_deref(), Some("cfg1"));
         assert_eq!(result.config.url, "http://example.com/callback");
@@ -462,7 +463,8 @@ mod tests {
         });
         let resp = post_jsonrpc(app, methods::CREATE_PUSH_CONFIG, params).await;
         assert!(resp.error.is_none(), "unexpected error: {:?}", resp.error);
-        let result = serde_json::from_value::<TaskPushNotificationConfig>(resp.result.unwrap()).unwrap();
+        let result =
+            serde_json::from_value::<TaskPushNotificationConfig>(resp.result.unwrap()).unwrap();
         assert_eq!(result.task_id, "t1");
         assert_eq!(result.config.id.as_deref(), Some("cfg1"));
         assert_eq!(result.config.url, "http://example.com/callback");
@@ -487,8 +489,9 @@ mod tests {
         });
         let resp = post_jsonrpc(app, methods::LIST_PUSH_CONFIGS, params).await;
         assert!(resp.error.is_none(), "unexpected error: {:?}", resp.error);
-        let result = serde_json::from_value::<Vec<TaskPushNotificationConfig>>(resp.result.unwrap())
-            .unwrap();
+        let result =
+            serde_json::from_value::<Vec<TaskPushNotificationConfig>>(resp.result.unwrap())
+                .unwrap();
         assert!(result.is_empty());
     }
 
diff --git a/a2a-server/src/lib.rs b/a2a-server/src/lib.rs
@@ -5,8 +5,8 @@ pub mod executor;
 pub mod handler;
 pub mod jsonrpc;
 pub mod middleware;
-mod push_config_compat;
 pub mod push;
+mod push_config_compat;
 pub mod rest;
 pub mod sse;
 pub mod task_store;
diff --git a/a2a-server/src/push_config_compat.rs b/a2a-server/src/push_config_compat.rs
@@ -7,4 +7,4 @@ use serde_json::Value;
 pub(crate) fn json_value<T: Serialize>(value: &T) -> Result<Value, A2AError> {
     serde_json::to_value(value)
         .map_err(|e| A2AError::internal(format!("failed to serialize JSON payload: {e}")))
-}
+}
diff --git a/examples/helloworld/tests/transports_e2e.rs b/examples/helloworld/tests/transports_e2e.rs
@@ -13,8 +13,7 @@ use a2a_server::jsonrpc::jsonrpc_router;
 use a2a_server::rest::rest_router;
 use a2a_server::{
     DefaultRequestHandler, ExecutorContext, HttpPushSender, InMemoryPushConfigStore,
-    InMemoryTaskStore, RequestHandler, ServiceParams,
-    WELL_KNOWN_AGENT_CARD_PATH,
+    InMemoryTaskStore, RequestHandler, ServiceParams, WELL_KNOWN_AGENT_CARD_PATH,
 };
 use async_trait::async_trait;
 use axum::body::Bytes;
@@ -271,7 +270,10 @@ impl RequestHandler for TestHandler {
 }
 
 impl a2a_server::AgentExecutor for PushTransportExecutor {
-    fn execute(&self, ctx: ExecutorContext) -> BoxStream<'static, Result<StreamResponse, A2AError>> {
+    fn execute(
+        &self,
+        ctx: ExecutorContext,
+    ) -> BoxStream<'static, Result<StreamResponse, A2AError>> {
         let working = StreamResponse::StatusUpdate(TaskStatusUpdateEvent {
             task_id: ctx.task_id.clone(),
             context_id: ctx.context_id.clone(),
@@ -346,10 +348,7 @@ async fn spawn_http_server() -> (String, tokio::task::JoinHandle<()>) {
 async fn spawn_push_http_server() -> (String, tokio::task::JoinHandle<()>) {
     let handler = Arc::new(
         DefaultRequestHandler::new(PushTransportExecutor, InMemoryTaskStore::new())
-            .with_push_notifications(
-                InMemoryPushConfigStore::new(),
-                HttpPushSender::new(None),
-            ),
+            .with_push_notifications(InMemoryPushConfigStore::new(), HttpPushSender::new(None)),
     );
     let app = Router::new()
         .nest("/rest", rest_router(handler.clone()))
@@ -389,14 +388,15 @@ async fn capture_push(
     StatusCode::ACCEPTED
 }
 
-async fn spawn_webhook_server(
-) -> (
+async fn spawn_webhook_server() -> (
     String,
     mpsc::UnboundedReceiver<CapturedPush>,
     tokio::task::JoinHandle<()>,
 ) {
     let (sender, receiver) = mpsc::unbounded_channel();
-    let app = Router::new().route("/", post(capture_push)).with_state(sender);
+    let app = Router::new()
+        .route("/", post(capture_push))
+        .with_state(sender);
     let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
     let addr = listener.local_addr().unwrap();
     let handle = tokio::spawn(async move {
@@ -861,7 +861,10 @@ async fn rest_transport_push_delivery_end_to_end() {
     assert!(matches!(response, SendMessageResponse::Task(_)));
 
     let first = recv_push(&mut receiver).await;
-    assert_eq!(first.authorization.as_deref(), Some("Basic dGVzdDpzZWNyZXQ="));
+    assert_eq!(
+        first.authorization.as_deref(),
+        Some("Basic dGVzdDpzZWNyZXQ=")
+    );
     assert_eq!(first.notification_token.as_deref(), Some("rest-token"));
     match first.event {
         StreamResponse::StatusUpdate(update) => {
@@ -872,7 +875,10 @@ async fn rest_transport_push_delivery_end_to_end() {
     }
 
     let second = recv_push(&mut receiver).await;
-    assert_eq!(second.authorization.as_deref(), Some("Basic dGVzdDpzZWNyZXQ="));
+    assert_eq!(
+        second.authorization.as_deref(),
+        Some("Basic dGVzdDpzZWNyZXQ=")
+    );
     assert_eq!(second.notification_token.as_deref(), Some("rest-token"));
     match second.event {
         StreamResponse::Task(task) => {

Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,4 @@ mod tests {`
`101`	`101`	`assert_eq!(parsed.configs, configs);`
`102`	`102`	`assert_eq!(parsed.next_page_token, None);`
`103`	`103`	`}`
`104`		`-}`
	`104`	`+}`