First compiling version of per-block-proc refactor

eth2/state_processing/src/macros.rs

@@ -1,8 +1,13 @@
-#[macro_use]
-macro_rules! ensure {
-    ($condition: expr, $result: ident) => {
+macro_rules! verify {
+    ($condition: expr, $result: expr) => {
         if !$condition {
-            return Err(Error::Invalid(Invalid::$result));
+            return Err(Error::Invalid($result));
         }
     };
 }
+
+macro_rules! invalid {
+    ($result: expr) => {
+        return Err(Error::Invalid($result));
+    };
+}