hacking

g-r-a-n-t · g-r-a-n-t · commit 030f68cdb448 · 2022-03-11T11:20:58.000-07:00
diff --git a/crates/fv/tests/specs.rs b/crates/fv/tests/specs.rs
@@ -8,8 +8,11 @@ macro_rules! test_spec {
             let src = fe_test_files::fixture(concat!("kspecs/", $src_path));
             let spec = fe_test_files::fixture(concat!("kspecs/", $spec_path));
 
-            fv::run_spec(&stringify!($name).replace("_", "-"), $src_path, &src, &spec)
-                .expect("spec failed");
+            if let Err(output) =
+                fv::run_spec(&stringify!($name).replace("_", "-"), $src_path, &src, &spec)
+            {
+                panic!("{}", output)
+            }
         }
     };
 }
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_42.k b/crates/test-files/fixtures/kspecs/sanity/returns_42.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_42_invalid.k b/crates/test-files/fixtures/kspecs/sanity/returns_42_invalid.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_in.k b/crates/test-files/fixtures/kspecs/sanity/returns_in.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_in_cond1.k b/crates/test-files/fixtures/kspecs/sanity/returns_in_cond1.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_in_cond2.k b/crates/test-files/fixtures/kspecs/sanity/returns_in_cond2.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_in_cond2_invalid.k b/crates/test-files/fixtures/kspecs/sanity/returns_in_cond2_invalid.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>
diff --git a/crates/test-files/fixtures/kspecs/sanity/returns_in_invalid.k b/crates/test-files/fixtures/kspecs/sanity/returns_in_invalid.k
@@ -7,7 +7,7 @@ module $TEST_NAME
         <k> #execute => #halt </k>
         <exit-code> 1 </exit-code>
         <mode> NORMAL </mode>
-        <schedule> LONDON </schedule>
+        <schedule> ISTANBUL </schedule>
 
         <ethereum>
             <evm>

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@ macro_rules! test_spec {`
`8`	`8`	`let src = fe_test_files::fixture(concat!("kspecs/", $src_path));`
`9`	`9`	`let spec = fe_test_files::fixture(concat!("kspecs/", $spec_path));`
`10`	`10`
`11`		`- fv::run_spec(&stringify!($name).replace("_", "-"), $src_path, &src, &spec)`
`12`		`- .expect("spec failed");`
	`11`	`+ if let Err(output) =`
	`12`	`+ fv::run_spec(&stringify!($name).replace("_", "-"), $src_path, &src, &spec)`
	`13`	`+ {`
	`14`	`+ panic!("{}", output)`
	`15`	`+ }`
`13`	`16`	`}`
`14`	`17`	`};`
`15`	`18`	`}`