From e0410d55367f79487dad2052793f1350ebbb7de1 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uwe.klotz@slowtec.de>
Date: Sun, 13 Oct 2024 18:52:52 +0200
Subject: [PATCH] Reorder arguments

---
 examples/rtu-client.rs |  2 +-
 src/service/rtu.rs     | 43 +++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/examples/rtu-client.rs b/examples/rtu-client.rs
index 98cad14..f74493e 100644
--- a/examples/rtu-client.rs
+++ b/examples/rtu-client.rs
@@ -25,7 +25,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     println!("Reading sensor values (request/response using the low-level API");
     let request = Request::ReadHoldingRegisters(SENSOR_ADDRESS, SENSOR_QUANTITY);
-    let request_context = client.send_request(request, SERVER).await?;
+    let request_context = client.send_request(SERVER, request).await?;
     let Response::ReadHoldingRegisters(values) = client.recv_response(request_context).await??
     else {
         // The response variant will always match its corresponding request variant if successful.
diff --git a/src/service/rtu.rs b/src/service/rtu.rs
index 0993400..f98645e 100644
--- a/src/service/rtu.rs
+++ b/src/service/rtu.rs
@@ -36,46 +36,51 @@ where
         disconnect(framed).await
     }
 
+    pub async fn call<'a>(&mut self, server: Slave, request: Request<'a>) -> Result<Response> {
+        let request_context = self.send_request(server, request).await?;
+        self.recv_response(request_context).await
+    }
+
     pub async fn send_request<'a>(
         &mut self,
-        request: Request<'a>,
         server: Slave,
+        request: Request<'a>,
     ) -> io::Result<RequestContext> {
-        self.send_request_pdu(request, server).await
+        self.send_request_pdu(server, request).await
     }
 
     async fn send_request_pdu<'a, R>(
         &mut self,
-        request: R,
         server: Slave,
+        request_pdu: R,
     ) -> io::Result<RequestContext>
     where
         R: Into<RequestPdu<'a>>,
     {
-        let request_adu = request_adu(request, server);
-        let context = request_adu.context();
+        let request_adu = request_adu(server, request_pdu);
+        self.send_request_adu(request_adu).await
+    }
 
-        let Self { framed } = self;
+    async fn send_request_adu<'a>(
+        &mut self,
+        request_adu: RequestAdu<'a>,
+    ) -> io::Result<RequestContext> {
+        let request_context = request_adu.context();
 
-        framed.read_buffer_mut().clear();
-        framed.send(request_adu).await?;
+        self.framed.read_buffer_mut().clear();
+        self.framed.send(request_adu).await?;
 
-        Ok(context)
+        Ok(request_context)
     }
 
     pub async fn recv_response(&mut self, request_context: RequestContext) -> Result<Response> {
-        let res_adu = self
+        let response_adu = self
             .framed
             .next()
             .await
             .unwrap_or_else(|| Err(io::Error::from(io::ErrorKind::BrokenPipe)))?;
 
-        res_adu.try_into_response(request_context)
-    }
-
-    pub async fn call<'a>(&mut self, request: Request<'a>, server: Slave) -> Result<Response> {
-        let request_context = self.send_request(request, server).await?;
-        self.recv_response(request_context).await
+        response_adu.try_into_response(request_context)
     }
 }
 
@@ -137,7 +142,7 @@ where
             return Err(io::Error::new(io::ErrorKind::NotConnected, "disconnected").into());
         };
 
-        client.call(request, self.server).await
+        client.call(self.server, request).await
     }
 }
 
@@ -171,14 +176,14 @@ where
     }
 }
 
-fn request_adu<'a, R>(req: R, server: Slave) -> RequestAdu<'a>
+fn request_adu<'a, R>(server: Slave, request_pdu: R) -> RequestAdu<'a>
 where
     R: Into<RequestPdu<'a>>,
 {
     let hdr = Header {
         slave_id: server.into(),
     };
-    let pdu = req.into();
+    let pdu = request_pdu.into();
     RequestAdu { hdr, pdu }
 }