From 63b1091129a6cd2b575c1c0186f866efb53f910b Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:13:53 -0400
Subject: [PATCH 1/3] fix(revme): use Osaka for state test results

---
 bins/revme/src/cmd/eofvalidation/test_suite.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bins/revme/src/cmd/eofvalidation/test_suite.rs b/bins/revme/src/cmd/eofvalidation/test_suite.rs
index 4fbb8fe676..12af210479 100644
--- a/bins/revme/src/cmd/eofvalidation/test_suite.rs
+++ b/bins/revme/src/cmd/eofvalidation/test_suite.rs
@@ -19,14 +19,14 @@ pub struct TestUnit {
 pub struct TestVector {
     pub code: Bytes,
     pub container_kind: Option<String>,
-    pub results: PragueTestResult,
+    pub results: OsakaTestResult,
 }
 
 #[derive(Debug, PartialEq, Eq, Deserialize)]
 #[serde(deny_unknown_fields)]
-pub struct PragueTestResult {
-    #[serde(rename = "Prague")]
-    pub prague: TestResult,
+pub struct OsakaTestResult {
+    #[serde(rename = "Osaka")]
+    pub osaka: TestResult,
 }
 
 #[derive(Debug, PartialEq, Eq, Deserialize)]

From d8eff25c6ab4ec4851e5904bb68e4401a511ff3b Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:16:15 -0400
Subject: [PATCH 2/3] fix usage of prague

---
 bins/revme/src/cmd/eofvalidation.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bins/revme/src/cmd/eofvalidation.rs b/bins/revme/src/cmd/eofvalidation.rs
index 40d0696225..e8e8c9b77a 100644
--- a/bins/revme/src/cmd/eofvalidation.rs
+++ b/bins/revme/src/cmd/eofvalidation.rs
@@ -1,6 +1,6 @@
 mod test_suite;
 
-pub use test_suite::{PragueTestResult, TestResult, TestSuite, TestUnit, TestVector};
+pub use test_suite::{OsakaTestResult, TestResult, TestSuite, TestUnit, TestVector};
 
 use crate::{cmd::Error, dir_utils::find_all_json_tests};
 use clap::Parser;
@@ -82,12 +82,12 @@ pub fn run_test(path: &Path) -> Result<(), Error> {
                     Some(CodeType::ReturnOrStop)
                 };
                 let res = validate_raw_eof_inner(test_vector.code.clone(), kind);
-                if res.is_ok() != test_vector.results.prague.result {
+                if res.is_ok() != test_vector.results.osaka.result {
                     println!(
                         "\nTest failed: {} - {}\nresult:{:?}\nrevm err_result:{:#?}\nbytes:{:?}\n",
                         name,
                         vector_name,
-                        test_vector.results.prague,
+                        test_vector.results.osaka,
                         res.as_ref().err(),
                         test_vector.code
                     );

From d9f03b9659e08c532856711ef4b6754d2c730f9a Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Fri, 1 Nov 2024 17:29:29 -0400
Subject: [PATCH 3/3] add prague as well

we must be using the version with both values for some reason, so
instead let's use the osaka value (afaik it should be the same?)
---
 bins/revme/src/cmd/eofvalidation/test_suite.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bins/revme/src/cmd/eofvalidation/test_suite.rs b/bins/revme/src/cmd/eofvalidation/test_suite.rs
index 12af210479..c3cf02c04f 100644
--- a/bins/revme/src/cmd/eofvalidation/test_suite.rs
+++ b/bins/revme/src/cmd/eofvalidation/test_suite.rs
@@ -27,6 +27,8 @@ pub struct TestVector {
 pub struct OsakaTestResult {
     #[serde(rename = "Osaka")]
     pub osaka: TestResult,
+    #[serde(rename = "Prague")]
+    pub prague: TestResult,
 }
 
 #[derive(Debug, PartialEq, Eq, Deserialize)]