From 5184eed40648c96ef768f27ee556ead5310eef46 Mon Sep 17 00:00:00 2001
From: Albert Esteve <aesteve@redhat.com>
Date: Fri, 2 Feb 2024 14:03:05 +0100
Subject: [PATCH] Revert "Allow a single retry with wrong msg_type"

This reverts commit c1d22452f496d9b888e7a7ce3e705c4837d75ab0.
---
 src/lib.rs | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c118c19..d5f160e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -329,7 +329,8 @@ impl Vhal {
 
     pub fn get_gear_selection(&self) -> Result<c::VehicleGear> {
         self.get_property(VehicleProperty::GEAR_SELECTION, 0)?;
-        let resp = self.recv_retry()?;
+        let resp = self.recv_cmd()?;
+        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
 
         Ok(c::VehicleGear::try_from(resp.expect_i32()?)
             .map_err(|_| VhalError::ReceiveMessageValueError)?)
@@ -342,8 +343,8 @@ impl Vhal {
 
     pub fn get_vehicle_speed(&self) -> Result<f32> {
         self.get_property(VehicleProperty::PERF_VEHICLE_SPEED, 0)?;
-        let resp = self.recv_retry()?;
-
+        let resp = self.recv_cmd()?;
+        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
         resp.expect_f32()
     }
 
@@ -354,8 +355,8 @@ impl Vhal {
 
     pub fn get_vehicle_display_speed(&self) -> Result<f32> {
         self.get_property(VehicleProperty::PERF_VEHICLE_SPEED_DISPLAY, 0)?;
-        let resp = self.recv_retry()?;
-
+        let resp = self.recv_cmd()?;
+        resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
         resp.expect_f32()
     }
 
@@ -426,17 +427,6 @@ impl Vhal {
 
         Ok(msg)
     }
-
-    fn recv_retry(&self) -> Result<EmulatorMessage> {
-        let mut resp = self.recv_cmd()?;
-        if resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP).is_err() {
-            // Allow a single retry.
-            resp = self.recv_cmd()?;
-            resp.is_valid(VehicleHalProto::MsgType::GET_PROPERTY_RESP)?;
-        }
-
-        Ok(resp)
-    }
 }
 
 #[cfg(test)]