Directory Restructure (#1163)

* Move tests -> testing

* Directory restructure

* Update Cargo.toml during restructure

* Update Makefile during restructure

* Fix arbitrary path

Cargo.toml

@@ -1,40 +1,6 @@
 [workspace]
 members = [
-    "eth2/proto_array_fork_choice",
-    "eth2/operation_pool",
-    "eth2/state_processing",
-    "eth2/types",
-    "eth2/utils/bls",
-    "eth2/utils/clap_utils",
-    "eth2/utils/compare_fields",
-    "eth2/utils/compare_fields_derive",
-    "eth2/utils/deposit_contract",
-    "eth2/utils/eth2_config",
-    "eth2/utils/eth2_interop_keypairs",
-    "eth2/utils/eth2_key_derivation",
-    "eth2/utils/eth2_keystore",
-    "eth2/utils/eth2_testnet_config",
-    "eth2/utils/eth2_wallet",
-    "eth2/utils/eth2_wallet_manager",
-    "eth2/utils/logging",
-    "eth2/utils/eth2_hashing",
-    "eth2/utils/hashset_delay",
-    "eth2/utils/lighthouse_metrics",
-    "eth2/utils/merkle_proof",
-    "eth2/utils/int_to_bytes",
-    "eth2/utils/safe_arith",
-    "eth2/utils/serde_hex",
-    "eth2/utils/slot_clock",
-    "eth2/utils/rest_types",
-    "eth2/utils/ssz",
-    "eth2/utils/ssz_derive",
-    "eth2/utils/ssz_types",
-    "eth2/utils/swap_or_not_shuffle",
-    "eth2/utils/cached_tree_hash",
-    "eth2/utils/tree_hash",
-    "eth2/utils/tree_hash_derive",
-    "eth2/utils/test_random_derive",
-    "eth2/utils/validator_dir",
+    "account_manager",
     "beacon_node",
     "beacon_node/beacon_chain",
     "beacon_node/client",
@@ -46,25 +12,64 @@ members = [
     "beacon_node/timer",
     "beacon_node/version",
     "beacon_node/websocket_server",
-    "tests/simulator",
-    "tests/ef_tests",
-    "tests/eth1_test_rig",
-    "tests/node_test_rig",
-    "tests/state_transition_vectors",
+
+    "common/clap_utils",
+    "common/compare_fields",
+    "common/compare_fields_derive",
+    "common/deposit_contract",
+    "common/eth2_config",
+    "common/eth2_interop_keypairs",
+    "common/eth2_testnet_config",
+    "common/eth2_wallet_manager",
+    "common/hashset_delay",
+    "common/lighthouse_metrics",
+    "common/logging",
+    "common/remote_beacon_node",
+    "common/rest_types",
+    "common/slot_clock",
+    "common/test_random_derive",
+    "common/validator_dir",
+
+    "consensus/cached_tree_hash",
+    "consensus/int_to_bytes",
+    "consensus/proto_array_fork_choice",
+    "consensus/safe_arith",
+    "consensus/ssz",
+    "consensus/ssz_derive",
+    "consensus/ssz_types",
+    "consensus/serde_hex",
+    "consensus/state_processing",
+    "consensus/swap_or_not_shuffle",
+    "consensus/tree_hash",
+    "consensus/tree_hash_derive",
+
+    "crypto/bls",
+    "crypto/eth2_hashing",
+    "crypto/eth2_key_derivation",
+    "crypto/eth2_keystore",
+    "crypto/eth2_wallet",
+
     "lcli",
+
+    "lighthouse",
+    "lighthouse/environment",
+
+    "testing/simulator",
+    "testing/ef_tests",
+    "testing/eth1_test_rig",
+    "testing/node_test_rig",
+    "testing/state_transition_vectors",
+
     "validator_client",
     "validator_client/slashing_protection",
-    "account_manager",
-    "lighthouse",
-    "lighthouse/environment"
 ]
 
 [patch]
 [patch.crates-io]
-tree_hash = { path = "eth2/utils/tree_hash" }
-tree_hash_derive = { path = "eth2/utils/tree_hash_derive" }
-eth2_ssz = { path = "eth2/utils/ssz" }
-eth2_ssz_derive = { path = "eth2/utils/ssz_derive" }
-eth2_ssz_types = { path = "eth2/utils/ssz_types" }
-eth2_hashing = { path = "eth2/utils/eth2_hashing" }
+tree_hash = { path = "consensus/tree_hash" }
+tree_hash_derive = { path = "consensus/tree_hash_derive" }
+eth2_ssz = { path = "consensus/ssz" }
+eth2_ssz_derive = { path = "consensus/ssz_derive" }
+eth2_ssz_types = { path = "consensus/ssz_types" }
+eth2_hashing = { path = "crypto/eth2_hashing" }
 web3 = { git = "https://github.com/tomusdrw/rust-web3" }

Makefile

@@ -1,7 +1,7 @@
 .PHONY: tests
 
-EF_TESTS = "tests/ef_tests"
-STATE_TRANSITION_VECTORS = "tests/state_transition_vectors"
+EF_TESTS = "testing/ef_tests"
+STATE_TRANSITION_VECTORS = "testing/state_transition_vectors"
 
 # Builds the Lighthouse binary in release (optimized).
 #
@@ -65,7 +65,7 @@ make-ef-tests:
 
 # Verifies that state_processing feature arbitrary-fuzz will compile
 arbitrary-fuzz:
-	cargo check --manifest-path=eth2/state_processing/Cargo.toml --features arbitrary-fuzz
+	cargo check --manifest-path=consensus/state_processing/Cargo.toml --features arbitrary-fuzz
 
 # Performs a `cargo` clean and cleans the `ef_tests` directory.
 clean:

account_manager/Cargo.toml

@@ -8,28 +8,28 @@ edition = "2018"
 tempdir = "0.3.7"
 
 [dependencies]
-bls = { path = "../eth2/utils/bls" }
+bls = { path = "../crypto/bls" }
 clap = "2.33.0"
 slog = "2.5.2"
 slog-term = "2.5.0"
 slog-async = "2.5.0"
-types = { path = "../eth2/types" }
+types = { path = "../consensus/types" }
 dirs = "2.0.2"
 environment = { path = "../lighthouse/environment" }
-deposit_contract = { path = "../eth2/utils/deposit_contract" }
+deposit_contract = { path = "../common/deposit_contract" }
 libc = "0.2.65"
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"
 hex = "0.4.2"
 validator_client = { path = "../validator_client" }
 rayon = "1.3.0"
-eth2_testnet_config = { path = "../eth2/utils/eth2_testnet_config" }
+eth2_testnet_config = { path = "../common/eth2_testnet_config" }
 web3 = "0.10.0"
 futures = { version = "0.3.5", features = ["compat"] }
-clap_utils = { path = "../eth2/utils/clap_utils" }
-eth2_wallet = { path = "../eth2/utils/eth2_wallet" }
-eth2_wallet_manager = { path = "../eth2/utils/eth2_wallet_manager" }
+clap_utils = { path = "../common/clap_utils" }
+eth2_wallet = { path = "../crypto/eth2_wallet" }
+eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
 rand = "0.7.2"
-validator_dir = { path = "../eth2/utils/validator_dir", features = ["unencrypted_keys"] }
+validator_dir = { path = "../common/validator_dir", features = ["unencrypted_keys"] }
 tokio = {version = "0.2.20", features = ["full"]}
-eth2_keystore = { path = "../eth2/utils/eth2_keystore" }
+eth2_keystore = { path = "../crypto/eth2_keystore" }

beacon_node/Cargo.toml

@@ -9,15 +9,15 @@ name = "beacon_node"
 path = "src/lib.rs"
 
 [dev-dependencies]
-node_test_rig = { path = "../tests/node_test_rig" }
+node_test_rig = { path = "../testing/node_test_rig" }
 
 [features]
 write_ssz_files = ["beacon_chain/write_ssz_files"]  # Writes debugging .ssz files to /tmp during block processing.
 
 [dependencies]
-eth2_config = { path = "../eth2/utils/eth2_config" }
+eth2_config = { path = "../common/eth2_config" }
 beacon_chain = { path = "beacon_chain" }
-types = { path = "../eth2/types" }
+types = { path = "../consensus/types" }
 store = { path = "./store" }
 client = { path = "client" }
 version = { path = "version" }
@@ -31,13 +31,13 @@ tokio = {version = "0.2.20", features = ["time"] }
 exit-future = "0.2.0"
 env_logger = "0.7.1"
 dirs = "2.0.2"
-logging = { path = "../eth2/utils/logging" }
+logging = { path = "../common/logging" }
 futures = "0.3.5"
 environment = { path = "../lighthouse/environment" }
 genesis = { path = "genesis" }
-eth2_testnet_config = { path = "../eth2/utils/eth2_testnet_config" }
+eth2_testnet_config = { path = "../common/eth2_testnet_config" }
 eth2-libp2p = { path = "./eth2-libp2p" }
 eth2_ssz = "0.1.2"
 toml = "0.5.6"
 serde = "1.0.110"
-clap_utils = { path = "../eth2/utils/clap_utils" }
+clap_utils = { path = "../common/clap_utils" }

beacon_node/beacon_chain/Cargo.toml

@@ -10,14 +10,14 @@ write_ssz_files = []  # Writes debugging .ssz files to /tmp during block process
 participation_metrics = []  # Exposes validator participation metrics to Prometheus.
 
 [dependencies]
-eth2_config = { path = "../../eth2/utils/eth2_config" }
-merkle_proof = { path = "../../eth2/utils/merkle_proof" }
+eth2_config = { path = "../../common/eth2_config" }
+merkle_proof = { path = "../../consensus/merkle_proof" }
 store = { path = "../store" }
 parking_lot = "0.10.2"
 lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 log = "0.4.8"
-operation_pool = { path = "../../eth2/operation_pool" }
+operation_pool = { path = "../operation_pool" }
 rayon = "1.3.0"
 serde = "1.0.110"
 serde_derive = "1.0.110"
@@ -25,14 +25,14 @@ serde_yaml = "0.8.11"
 serde_json = "1.0.52"
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 sloggers = "1.0.0"
-slot_clock = { path = "../../eth2/utils/slot_clock" }
+slot_clock = { path = "../../common/slot_clock" }
 eth2_hashing = "0.1.0"
 eth2_ssz = "0.1.2"
-eth2_ssz_types = { path = "../../eth2/utils/ssz_types" }
+eth2_ssz_types = { path = "../../consensus/ssz_types" }
 eth2_ssz_derive = "0.1.0"
-state_processing = { path = "../../eth2/state_processing" }
+state_processing = { path = "../../consensus/state_processing" }
 tree_hash = "0.1.0"
-types = { path = "../../eth2/types" }
+types = { path = "../../consensus/types" }
 tokio = "0.2.20"
 eth1 = { path = "../eth1" }
 websocket_server = { path = "../websocket_server" }
@@ -40,12 +40,12 @@ futures = "0.3.5"
 genesis = { path = "../genesis" }
 integer-sqrt = "0.1.3"
 rand = "0.7.3"
-proto_array_fork_choice = { path = "../../eth2/proto_array_fork_choice" }
+proto_array_fork_choice = { path = "../../consensus/proto_array_fork_choice" }
 lru = "0.4.3"
 tempfile = "3.1.0"
 bitvec = "0.17.4"
-bls = { path = "../../eth2/utils/bls" }
-safe_arith = { path = "../../eth2/utils/safe_arith" }
+bls = { path = "../../crypto/bls" }
+safe_arith = { path = "../../consensus/safe_arith" }
 
 [dev-dependencies]
 lazy_static = "1.4.0"

beacon_node/client/Cargo.toml

@@ -18,10 +18,10 @@ rest_api = { path = "../rest_api" }
 parking_lot = "0.10.2"
 websocket_server = { path = "../websocket_server" }
 prometheus = "0.8.0"
-types = { path = "../../eth2/types" }
+types = { path = "../../consensus/types" }
 tree_hash = "0.1.0"
-eth2_config = { path = "../../eth2/utils/eth2_config" }
-slot_clock = { path = "../../eth2/utils/slot_clock" }
+eth2_config = { path = "../../common/eth2_config" }
+slot_clock = { path = "../../common/slot_clock" }
 serde = "1.0.110"
 serde_derive = "1.0.110"
 error-chain = "0.12.2"
@@ -38,4 +38,4 @@ genesis = { path = "../genesis" }
 environment = { path = "../../lighthouse/environment" }
 eth2_ssz = "0.1.2"
 lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }

beacon_node/eth1/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dev-dependencies]
-eth1_test_rig = { path = "../../tests/eth1_test_rig" }
+eth1_test_rig = { path = "../../testing/eth1_test_rig" }
 environment = { path = "../../lighthouse/environment" }
 toml = "0.5.6"
 web3 = "0.10.0"
@@ -17,8 +17,8 @@ futures = { version = "0.3.5", features = ["compat"] }
 serde_json = "1.0.52"
 serde = { version = "1.0.110", features = ["derive"] }
 hex = "0.4.2"
-types = { path = "../../eth2/types"}
-merkle_proof = { path = "../../eth2/utils/merkle_proof"}
+types = { path = "../../consensus/types"}
+merkle_proof = { path = "../../consensus/merkle_proof"}
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"
 tree_hash = "0.1.0"
@@ -26,7 +26,7 @@ eth2_hashing = "0.1.0"
 parking_lot = "0.10.2"
 slog = "2.5.2"
 tokio = { version = "0.2.20", features = ["full"] }
-state_processing = { path = "../../eth2/state_processing" }
+state_processing = { path = "../../consensus/state_processing" }
 libflate = "1.0.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics"}
+lighthouse_metrics = { path = "../../common/lighthouse_metrics"}
 lazy_static = "1.4.0"

beacon_node/eth2-libp2p/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2018"
 
 [dependencies]
 hex = "0.4.2"
-types = { path =  "../../eth2/types" }
-hashset_delay = { path = "../../eth2/utils/hashset_delay" }
-eth2_ssz_types = { path =  "../../eth2/utils/ssz_types" }
+types = { path =  "../../consensus/types" }
+hashset_delay = { path = "../../common/hashset_delay" }
+eth2_ssz_types = { path =  "../../consensus/ssz_types" }
 serde = { version = "1.0.110", features = ["derive"] }
 serde_derive = "1.0.110"
 eth2_ssz = "0.1.2"
@@ -22,7 +22,7 @@ dirs = "2.0.2"
 fnv = "1.0.6"
 unsigned-varint = { git = "https://github.com/sigp/unsigned-varint", branch = "latest-codecs", features = ["codec"] }
 lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 smallvec = "1.4.0"
 lru = "0.4.3"
 parking_lot = "0.10.2"
@@ -35,7 +35,7 @@ tokio-util = { version = "0.3.1", features = ["codec", "compat"] }
 # Patched for quick updates
 discv5 = { git = "https://github.com/sigp/discv5", rev = "7b3bd40591b62b8c002ffdb85de008aa9f82e2e5" }
 tiny-keccak = "2.0.2"
-libp2p-tcp = { version = "0.18.0", default-features = false, features = ["tokio"] } 
+libp2p-tcp = { version = "0.18.0", default-features = false, features = ["tokio"] }
 
 [dependencies.libp2p]
 version = "0.18.1"

beacon_node/genesis/Cargo.toml

@@ -5,16 +5,16 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dev-dependencies]
-eth1_test_rig = { path = "../../tests/eth1_test_rig" }
+eth1_test_rig = { path = "../../testing/eth1_test_rig" }
 
 [dependencies]
 futures = "0.3.5"
-types = { path = "../../eth2/types"}
+types = { path = "../../consensus/types"}
 environment = { path = "../../lighthouse/environment"}
 eth1 = { path = "../eth1"}
 rayon = "1.3.0"
-state_processing = { path = "../../eth2/state_processing" }
-merkle_proof = { path = "../../eth2/utils/merkle_proof" }
+state_processing = { path = "../../consensus/state_processing" }
+merkle_proof = { path = "../../consensus/merkle_proof" }
 eth2_ssz = "0.1.2"
 eth2_hashing = "0.1.0"
 tree_hash = "0.1.0"
@@ -24,4 +24,4 @@ slog = "2.5.2"
 exit-future = "0.2.0"
 serde = "1.0.110"
 serde_derive = "1.0.110"
-int_to_bytes = { path = "../../eth2/utils/int_to_bytes" }
+int_to_bytes = { path = "../../consensus/int_to_bytes" }

beacon_node/network/Cargo.toml

@@ -15,10 +15,10 @@ tempfile = "3.1.0"
 beacon_chain =  { path = "../beacon_chain" }
 store =  { path = "../store" }
 eth2-libp2p =  { path = "../eth2-libp2p" }
-hashset_delay = { path = "../../eth2/utils/hashset_delay" }
-rest_types = { path = "../../eth2/utils/rest_types" }
-types = { path = "../../eth2/types" }
-slot_clock = { path = "../../eth2/utils/slot_clock" }
+hashset_delay = { path = "../../common/hashset_delay" }
+rest_types = { path = "../../common/rest_types" }
+types = { path = "../../consensus/types" }
+slot_clock = { path = "../../common/slot_clock" }
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 hex = "0.4.2"
 eth2_ssz = "0.1.2"
@@ -33,4 +33,4 @@ rand = "0.7.3"
 fnv = "1.0.6"
 rlp = "0.4.5"
 lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }

beacon_node/operation_pool/Cargo.toml

@@ -5,15 +5,15 @@ authors = ["Michael Sproul <michael@sigmaprime.io>"]
 edition = "2018"
 
 [dependencies]
-int_to_bytes = { path = "../utils/int_to_bytes" }
+int_to_bytes = { path = "../../consensus/int_to_bytes" }
 parking_lot = "0.10.2"
-types = { path = "../types" }
-state_processing = { path = "../state_processing" }
+types = { path = "../../consensus/types" }
+state_processing = { path = "../../consensus/state_processing" }
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"
 serde = "1.0.110"
 serde_derive = "1.0.110"
-store = { path = "../../beacon_node/store" }
+store = { path = "../store" }
 
 [dev-dependencies]
 rand = "0.7.3"

beacon_node/rest_api/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-bls = { path = "../../eth2/utils/bls" }
-rest_types = { path = "../../eth2/utils/rest_types" }
+bls = { path = "../../crypto/bls" }
+rest_types = { path = "../../common/rest_types" }
 beacon_chain = { path = "../beacon_chain" }
 network = { path = "../network" }
 eth2-libp2p = { path = "../eth2-libp2p" }
@@ -21,23 +21,23 @@ slog-term = "2.5.0"
 slog-async = "2.5.0"
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"
-state_processing = { path = "../../eth2/state_processing" }
-types = { path = "../../eth2/types" }
+state_processing = { path = "../../consensus/state_processing" }
+types = { path = "../../consensus/types" }
 http = "0.2.1"
 hyper = "0.13.5"
 tokio = { version = "0.2", features = ["sync"] }
 url = "2.1.1"
 lazy_static = "1.4.0"
-eth2_config = { path = "../../eth2/utils/eth2_config" }
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
-slot_clock = { path = "../../eth2/utils/slot_clock" }
+eth2_config = { path = "../../common/eth2_config" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
+slot_clock = { path = "../../common/slot_clock" }
 hex = "0.4.2"
 parking_lot = "0.10.2"
 futures = "0.3.5"
-operation_pool = { path = "../../eth2/operation_pool" }
+operation_pool = { path = "../operation_pool" }
 rayon = "1.3.0"
 
 [dev-dependencies]
-remote_beacon_node = { path = "../../eth2/utils/remote_beacon_node" }
-node_test_rig = { path = "../../tests/node_test_rig" }
+remote_beacon_node = { path = "../../common/remote_beacon_node" }
+node_test_rig = { path = "../../testing/node_test_rig" }
 tree_hash = "0.1.0"

beacon_node/store/Cargo.toml

@@ -22,11 +22,11 @@ itertools = "0.9.0"
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"
 tree_hash = "0.1.0"
-types = { path =  "../../eth2/types" }
-state_processing = { path = "../../eth2/state_processing" }
+types = { path =  "../../consensus/types" }
+state_processing = { path = "../../consensus/state_processing" }
 slog = "2.5.2"
 serde = "1.0.110"
 serde_derive = "1.0.110"
 lazy_static = "1.4.0"
-lighthouse_metrics = { path = "../../eth2/utils/lighthouse_metrics" }
+lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 lru = "0.4.3"

beacon_node/timer/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2018"
 
 [dependencies]
 beacon_chain =  { path = "../beacon_chain" }
-types = { path = "../../eth2/types" }
-slot_clock = { path = "../../eth2/utils/slot_clock" }
+types = { path = "../../consensus/types" }
+slot_clock = { path = "../../common/slot_clock" }
 tokio = { version = "0.2.20", features = ["full"] }
 slog = "2.5.2"
 parking_lot = "0.10.2"

beacon_node/websocket_server/Cargo.toml

@@ -13,5 +13,5 @@ serde_derive = "1.0.110"
 serde_json = "1.0.52"
 slog = "2.5.2"
 tokio = { version = "0.2.20", features = ["full"] }
-types = { path = "../../eth2/types" }
+types = { path = "../../consensus/types" }
 ws = "0.9.1"

book/src/setup.md

@@ -19,7 +19,7 @@ As with most other Rust projects, Lighthouse uses `cargo test` for unit and
 integration tests. For example, to test the `ssz` crate run:
 
 ```bash
-cd eth2/utils/ssz
+cd consensus/ssz
 cargo test
 ```
 

common/clap_utils/Cargo.toml

@@ -10,6 +10,6 @@ edition = "2018"
 clap = "2.33.0"
 hex = "0.4.2"
 dirs = "2.0.2"
-types = { path = "../../types" }
+types = { path = "../../consensus/types" }
 eth2_testnet_config = { path = "../eth2_testnet_config" }
 eth2_ssz = "0.1.2"

common/deposit_contract/Cargo.toml

@@ -11,7 +11,7 @@ reqwest = { version = "0.10.4", features = ["blocking", "json"] }
 serde_json = "1.0.52"
 
 [dependencies]
-types = { path = "../../types"}
+types = { path = "../../consensus/types"}
 eth2_ssz = "0.1.2"
 tree_hash = "0.1.0"
 ethabi = "12.0.0"

common/eth2_config/Cargo.toml

@@ -8,4 +8,4 @@ edition = "2018"
 serde = "1.0.110"
 serde_derive = "1.0.110"
 toml = "0.5.6"
-types = { path = "../../types" }
+types = { path = "../../consensus/types" }

common/eth2_testnet_config/Cargo.toml

@@ -15,6 +15,6 @@ tempdir = "0.3.7"
 [dependencies]
 serde = "1.0.110"
 serde_yaml = "0.8.11"
-types = { path = "../../types"}
-eth2-libp2p = { path = "../../../beacon_node/eth2-libp2p"}
+types = { path = "../../consensus/types"}
+eth2-libp2p = { path = "../../beacon_node/eth2-libp2p"}
 eth2_ssz = "0.1.2"

common/eth2_wallet_manager/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-eth2_keystore = { path = "../eth2_keystore" }
-eth2_wallet = { path = "../eth2_wallet" }
+eth2_keystore = { path = "../../crypto/eth2_keystore" }
+eth2_wallet = { path = "../../crypto/eth2_wallet" }
 
 [dev-dependencies]
 tempfile = "3.1.0"

common/remote_beacon_node/Cargo.toml

@@ -11,11 +11,11 @@ reqwest = { version = "0.10.4", features = ["json"] }
 url = "2.1.1"
 serde = "1.0.110"
 futures = "0.3.5"
-types = { path = "../../../eth2/types" }
+types = { path = "../../consensus/types" }
 rest_types = { path = "../rest_types" }
 hex = "0.4.2"
 eth2_ssz = "0.1.2"
 serde_json = "1.0.52"
-eth2_config = { path = "../../../eth2/utils/eth2_config" }
-proto_array_fork_choice = { path = "../../../eth2/proto_array_fork_choice" }
-operation_pool = { path = "../../../eth2/operation_pool" }
+eth2_config = { path = "../eth2_config" }
+proto_array_fork_choice = { path = "../../consensus/proto_array_fork_choice" }
+operation_pool = { path = "../../beacon_node/operation_pool" }

common/rest_types/Cargo.toml

@@ -5,12 +5,12 @@ authors = ["Age Manning <Age@AgeManning.com>"]
 edition = "2018"
 
 [dependencies]
-types = { path = "../../types" }
+types = { path = "../../consensus/types" }
 eth2_ssz_derive = "0.1.0"
 eth2_ssz = "0.1.2"
 eth2_hashing = "0.1.0"
 tree_hash = "0.1.0"
-state_processing = { path = "../../state_processing" }
-bls = { path = "../bls" }
+state_processing = { path = "../../consensus/state_processing" }
+bls = { path = "../../crypto/bls" }
 serde = { version = "1.0.110", features = ["derive"] }
 rayon = "1.3.0"

common/slot_clock/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-types = { path = "../../types" }
+types = { path = "../../consensus/types" }
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../lighthouse_metrics" }
 parking_lot = "0.10.2"

common/validator_dir/Cargo.toml

@@ -11,16 +11,16 @@ insecure_keys = []
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-eth2_wallet = { path = "../eth2_wallet" }
-bls = { path = "../bls" }
-eth2_keystore = { path = "../eth2_keystore" }
-types = { path = "../../types" }
+eth2_wallet = { path = "../../crypto/eth2_wallet" }
+bls = { path = "../../crypto/bls" }
+eth2_keystore = { path = "../../crypto/eth2_keystore" }
+types = { path = "../../consensus/types" }
 rand = "0.7.2"
 deposit_contract = { path = "../deposit_contract" }
-eth2_ssz = { path = "../ssz" }
-eth2_ssz_derive = { path = "../ssz_derive" }
+eth2_ssz = { path = "../../consensus/ssz" }
+eth2_ssz_derive = { path = "../../consensus/ssz_derive" }
 rayon = "1.3.0"
-tree_hash = { path = "../tree_hash" }
+tree_hash = { path = "../../consensus/tree_hash" }
 
 [dev-dependencies]
 tempfile = "3.1.0"