Merge branch 'api-alignment' into validator-post-fns

Cargo.toml

@@ -34,7 +34,7 @@ members = [
 	"beacon_node/version",
 	"beacon_node/beacon_chain",
 	"tests/ef_tests",
-	"tests/lcli",
+	"lcli",
 	"protos",
 	"validator_client",
 	"account_manager",

beacon_node/src/main.rs

@@ -357,6 +357,14 @@ fn main() {
 
     let log = slog::Logger::root(drain.fuse(), o!());
 
+    if std::mem::size_of::<usize>() != 8 {
+        crit!(
+            log,
+            "Lighthouse only supports 64bit CPUs";
+            "detected" => format!("{}bit", std::mem::size_of::<usize>() * 8)
+        );
+    }
+
     warn!(
         log,
         "Ethereum 2.0 is pre-release. This software is experimental."

lcli/Cargo.toml

@@ -14,6 +14,6 @@ log = "0.4"
 serde = "1.0"
 serde_yaml = "0.8"
 simple_logger = "1.0"
-types = { path = "../../eth2/types" }
-state_processing = { path = "../../eth2/state_processing" }
-eth2_ssz = { path = "../../eth2/utils/ssz" }
+types = { path = "../eth2/types" }
+state_processing = { path = "../eth2/state_processing" }
+eth2_ssz = { path = "../eth2/utils/ssz" }

validator_client/src/main.rs

@@ -165,6 +165,14 @@ fn main() {
 
     let mut log = slog::Logger::root(drain.fuse(), o!());
 
+    if std::mem::size_of::<usize>() != 8 {
+        crit!(
+            log,
+            "Lighthouse only supports 64bit CPUs";
+            "detected" => format!("{}bit", std::mem::size_of::<usize>() * 8)
+        );
+    }
+
     let (client_config, eth2_config) = match get_configs(&matches, &mut log) {
         Ok(tuple) => tuple,
         Err(e) => {