feat: new e2e packets

Author: filipton

src/e2e/main.rs

@@ -157,7 +157,6 @@ async fn test_sender(esp_id: u32, senders: SharedSenders, tests: TestsRoot) -> R
     let unix_tx = UNIX_SENDER.get().expect("UNIX_SENDER not set!");
     let mut rx = spawn_new_sender(&senders, esp_id).await?;
 
-    send_test_packet(&unix_tx, &mut rx, esp_id, TestPacketData::Start).await?;
     send_test_packet(&unix_tx, &mut rx, esp_id, TestPacketData::ResetState).await?;
 
     let mut prev_idx: Option<usize> = None;
@@ -251,11 +250,21 @@ async fn run_step(
         }
         TestStep::SolveTime(time) => {
             *last_time = *time;
-            send_test_packet(&unix_tx, rx, esp_id, TestPacketData::SolveTime(*time)).await?;
+            send_test_packet(&unix_tx, rx, esp_id, TestPacketData::StackmatTime(*time)).await?;
+
+            tokio::time::sleep(Duration::from_millis(*time + 100)).await;
         }
         TestStep::SolveTimeRng => {
             *last_time = random_time;
-            send_test_packet(&unix_tx, rx, esp_id, TestPacketData::SolveTime(random_time)).await?;
+            send_test_packet(
+                &unix_tx,
+                rx,
+                esp_id,
+                TestPacketData::StackmatTime(random_time),
+            )
+            .await?;
+
+            tokio::time::sleep(Duration::from_millis(random_time + 100)).await;
         }
         TestStep::Snapshot => {
             send_test_packet(&unix_tx, rx, esp_id, TestPacketData::Snapshot).await?;
@@ -267,14 +276,14 @@ async fn run_step(
             send_test_packet(&unix_tx, rx, esp_id, TestPacketData::ScanCard(*card_id)).await?;
         }
         TestStep::Button { ref name, time } => {
-            let pins = tests.buttons.get(name);
-            if let Some(pins) = pins {
+            let pin = tests.buttons.get(name);
+            if let Some(&pin) = pin {
                 send_test_packet(
                     &unix_tx,
                     rx,
                     esp_id,
                     TestPacketData::ButtonPress {
-                        pins: pins.to_owned(),
+                        pin,
                         press_time: *time,
                     },
                 )

src/e2e/structs.rs

@@ -24,7 +24,7 @@ pub struct CompetitorInfo {
 pub struct TestsRoot {
     pub dump_state_after_test: bool,
     pub cards: HashMap<u64, CompetitorInfo>,
-    pub buttons: HashMap<String, Vec<u8>>,
+    pub buttons: HashMap<String, u8>,
     pub tests: Vec<TestData>,
 }
 

tests.json

@@ -1,5 +1,5 @@
 {
-    "dumpStateAfterTest": true,
+    "dumpStateAfterTest": false,
     "cards": {
         "69420": {
             "registrantId": 1,
@@ -21,18 +21,10 @@
         }
     },
     "buttons": {
-        "penalty": [
-            32
-        ],
-        "inspect": [
-            27
-        ],
-        "delegate": [
-            26
-        ],
-        "submit": [
-            33
-        ]
+        "penalty": 3,
+        "inspect": 0,
+        "delegate": 1,
+        "submit": 2
     },
     "tests": [
         {
@@ -54,21 +46,21 @@
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "submit",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
@@ -107,14 +99,14 @@
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "submit",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
@@ -193,28 +185,28 @@
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "penalty",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {
                     "type": "Button",
                     "data": {
                         "name": "submit",
-                        "time": 50
+                        "time": 100
                     }
                 },
                 {

unix-utils/src/lib.rs

@@ -12,12 +12,11 @@ pub struct UnixError {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type", content = "data")]
 pub enum TestPacketData {
-    Start,
-    End,
     ResetState,
     ScanCard(u64),
-    ButtonPress { pins: Vec<u8>, press_time: u64 },
-    SolveTime(u64),
+    ButtonPress { pin: u8, press_time: u64 },
+    StackmatTime(u64),
+    StackmatReset,
     Snapshot,
 }