From 7c80e8a2805db5005fd83d1ecc21c5f246b41b21 Mon Sep 17 00:00:00 2001
From: Thomas Coratger <thomas.coratger@gmail.com>
Date: Thu, 7 Nov 2024 09:21:21 +0100
Subject: [PATCH] derive PartialEq and Eq for ProgramMemory and MutableState

---
 crates/brainfuck_vm/src/machine.rs | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/crates/brainfuck_vm/src/machine.rs b/crates/brainfuck_vm/src/machine.rs
index a69673b..37c0b92 100644
--- a/crates/brainfuck_vm/src/machine.rs
+++ b/crates/brainfuck_vm/src/machine.rs
@@ -60,10 +60,12 @@ impl MachineBuilder {
     }
 }
 
+#[derive(Debug, Default, PartialEq, Eq)]
 pub struct ProgramMemory {
     code: Vec<BaseField>,
 }
 
+#[derive(Debug, Default, PartialEq, Eq)]
 pub struct MutableState {
     ram: Vec<BaseField>,
     registers: Registers,
@@ -237,9 +239,14 @@ mod tests {
         let code = vec![BaseField::from(43)];
         let (machine, _) = create_test_machine(&code, &[]);
 
-        assert_eq!(machine.program.code, code);
-        assert_eq!(machine.state.ram.len(), Machine::DEFAULT_RAM_SIZE);
-        assert!(machine.state.ram.iter().all(|&x| x == BaseField::zero()));
+        assert_eq!(machine.program, ProgramMemory { code });
+        assert_eq!(
+            machine.state,
+            MutableState {
+                ram: vec![BaseField::zero(); Machine::DEFAULT_RAM_SIZE],
+                ..Default::default()
+            }
+        );
     }
 
     #[test]
@@ -250,9 +257,11 @@ mod tests {
         let ram_size = 55000;
         let machine = Machine::new_with_config(&code, input, output, ram_size);
 
-        assert_eq!(machine.program.code, code);
-        assert_eq!(machine.state.ram.len(), ram_size);
-        assert!(machine.state.ram.iter().all(|&x| x == BaseField::zero()));
+        assert_eq!(machine.program, ProgramMemory { code });
+        assert_eq!(
+            machine.state,
+            MutableState { ram: vec![BaseField::zero(); ram_size], ..Default::default() }
+        );
     }
 
     #[test]
@@ -262,6 +271,7 @@ mod tests {
         let (mut machine, _) = create_test_machine(&code, &[]);
         machine.execute()?;
 
+        assert_eq!(machine.program, ProgramMemory { code });
         assert_eq!(machine.state.registers.mp, BaseField::from(2));
         Ok(())
     }
@@ -394,11 +404,7 @@ mod tests {
             mvi: BaseField::from(2).inverse(),
         };
 
-        assert_eq!(trace.len(), 3);
-        assert_eq!(trace[0], initial_state);
-        assert_eq!(trace[1], intermediate_state);
-        assert_eq!(trace[2], final_state);
-
+        assert_eq!(trace, vec![initial_state, intermediate_state, final_state]);
         Ok(())
     }