Merge pull request #127 from drozdziak1/122-rust-2018

2018-ify everything

Cargo.toml

@@ -2,6 +2,7 @@
 name = "lighthouse"
 version = "0.0.1"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 blake2-rfc = "0.2.18"

beacon_chain/attestation_validation/Cargo.toml

@@ -2,6 +2,7 @@
 name = "attestation_validation"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls = { path = "../utils/bls" }

beacon_chain/attestation_validation/src/lib.rs

@@ -15,9 +15,9 @@ mod justified_slot;
 mod shard_block;
 mod signature;
 
-pub use enums::{Invalid, Outcome, Error};
-pub use block_inclusion::validate_attestation_for_block;
-pub use justified_slot::validate_attestation_justified_slot;
-pub use justified_block::validate_attestation_justified_block_hash;
-pub use signature::validate_attestation_signature;
-pub use shard_block::validate_attestation_data_shard_block_hash;
+pub use crate::enums::{Invalid, Outcome, Error};
+pub use crate::block_inclusion::validate_attestation_for_block;
+pub use crate::justified_slot::validate_attestation_justified_slot;
+pub use crate::justified_block::validate_attestation_justified_block_hash;
+pub use crate::signature::validate_attestation_signature;
+pub use crate::shard_block::validate_attestation_data_shard_block_hash;

beacon_chain/chain/Cargo.toml

@@ -2,6 +2,7 @@
 name = "chain"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls = { path = "../utils/bls" }

beacon_chain/chain/src/lib.rs

@@ -14,11 +14,11 @@ mod stores;
 mod transition;
 
 use db::ClientDB;
-use genesis::{genesis_states, Error as GenesisError};
-use maps::{generate_attester_and_proposer_maps, AttesterAndProposerMapError};
+use crate::genesis::{genesis_states, Error as GenesisError};
+use crate::maps::{generate_attester_and_proposer_maps, AttesterAndProposerMapError};
 use std::collections::HashMap;
 use std::sync::Arc;
-use stores::BeaconChainStore;
+use crate::stores::BeaconChainStore;
 use types::{ActiveState, AttesterMap, ChainConfig, CrystallizedState, Hash256, ProposerMap};
 
 #[derive(Debug, PartialEq)]

beacon_chain/naive_fork_choice/Cargo.toml

@@ -2,6 +2,7 @@
 name = "naive_fork_choice"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 db = { path = "../../lighthouse/db" }

beacon_chain/spec/Cargo.toml

@@ -2,6 +2,7 @@
 name = "spec"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 types = { path = "../types" }

beacon_chain/state-transition/Cargo.toml

@@ -2,6 +2,7 @@
 name = "state-transition"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 types = { path = "../types" }

beacon_chain/types/Cargo.toml

@@ -2,6 +2,7 @@
 name = "types"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls = { path = "../utils/bls" }

beacon_chain/types/src/lib.rs

@@ -23,20 +23,20 @@ pub mod validator_registration;
 use self::ethereum_types::{H160, H256, U256};
 use std::collections::HashMap;
 
-pub use active_state::ActiveState;
-pub use attestation_data::AttestationData;
-pub use attestation::Attestation;
-pub use beacon_block::BeaconBlock;
-pub use beacon_state::BeaconState;
-pub use chain_config::ChainConfig;
-pub use crosslink_record::CrosslinkRecord;
-pub use crystallized_state::CrystallizedState;
-pub use fork_data::ForkData;
-pub use pending_attestation_record::PendingAttestationRecord;
-pub use shard_and_committee::ShardAndCommittee;
-pub use special_record::{SpecialRecord, SpecialRecordKind};
-pub use validator_record::{ValidatorRecord, ValidatorStatus};
-pub use validator_registration::ValidatorRegistration;
+pub use crate::active_state::ActiveState;
+pub use crate::attestation_data::AttestationData;
+pub use crate::attestation::Attestation;
+pub use crate::beacon_block::BeaconBlock;
+pub use crate::beacon_state::BeaconState;
+pub use crate::chain_config::ChainConfig;
+pub use crate::crosslink_record::CrosslinkRecord;
+pub use crate::crystallized_state::CrystallizedState;
+pub use crate::fork_data::ForkData;
+pub use crate::pending_attestation_record::PendingAttestationRecord;
+pub use crate::shard_and_committee::ShardAndCommittee;
+pub use crate::special_record::{SpecialRecord, SpecialRecordKind};
+pub use crate::validator_record::{ValidatorRecord, ValidatorStatus};
+pub use crate::validator_registration::ValidatorRegistration;
 
 pub type Hash256 = H256;
 pub type Address = H160;

beacon_chain/utils/bls/Cargo.toml

@@ -2,6 +2,7 @@
 name = "bls"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls-aggregates = { git = "https://github.com/sigp/signature-schemes" }

beacon_chain/utils/boolean-bitfield/Cargo.toml

@@ -2,6 +2,7 @@
 name = "boolean-bitfield"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 ssz = { path = "../ssz" }

beacon_chain/utils/hashing/Cargo.toml

@@ -2,6 +2,7 @@
 name = "hashing"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 tiny-keccak = "1.4.2"

beacon_chain/utils/honey-badger-split/Cargo.toml

@@ -2,5 +2,6 @@
 name = "honey-badger-split"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]

beacon_chain/utils/slot-clock/Cargo.toml

@@ -2,5 +2,6 @@
 name = "slot-clock"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]

beacon_chain/utils/ssz/Cargo.toml

@@ -2,6 +2,7 @@
 name = "ssz"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bytes = "0.4.9"

beacon_chain/utils/ssz/src/lib.rs

@@ -16,8 +16,8 @@ pub mod encode;
 mod impl_decode;
 mod impl_encode;
 
-pub use decode::{decode_ssz, decode_ssz_list, Decodable, DecodeError};
-pub use encode::{Encodable, SszStream};
+pub use crate::decode::{decode_ssz, decode_ssz_list, Decodable, DecodeError};
+pub use crate::encode::{Encodable, SszStream};
 
 pub const LENGTH_BYTES: usize = 4;
 pub const MAX_LIST_SIZE: usize = 1 << (4 * 8);

beacon_chain/utils/ssz_helpers/Cargo.toml

@@ -2,6 +2,7 @@
 name = "ssz_helpers"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls = { path = "../bls" }

beacon_chain/utils/vec_shuffle/Cargo.toml

@@ -2,6 +2,7 @@
 name = "vec_shuffle"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 hashing = { path = "../hashing" }

beacon_chain/validator_change/Cargo.toml

@@ -2,6 +2,7 @@
 name = "validator_change"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bytes = "0.4.10"

beacon_chain/validator_induction/Cargo.toml

@@ -2,6 +2,7 @@
 name = "validator_induction"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 bls = { path = "../utils/bls" }

beacon_chain/validator_induction/src/lib.rs

@@ -4,4 +4,4 @@ extern crate types;
 
 mod inductor;
 
-pub use inductor::{ValidatorInductionError, ValidatorInductor};
+pub use crate::inductor::{ValidatorInductionError, ValidatorInductor};

beacon_chain/validator_shuffling/Cargo.toml

@@ -2,6 +2,7 @@
 name = "validator_shuffling"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 honey-badger-split = { path = "../utils/honey-badger-split" }

beacon_chain/validator_shuffling/src/lib.rs

@@ -4,4 +4,4 @@ extern crate vec_shuffle;
 
 mod shuffle;
 
-pub use shuffle::{shard_and_committees_for_cycle, ValidatorAssignmentError};
+pub use crate::shuffle::{shard_and_committees_for_cycle, ValidatorAssignmentError};

lighthouse/db/Cargo.toml

@@ -2,6 +2,7 @@
 name = "db"
 version = "0.1.0"
 authors = ["Paul Hauner <paul@paulhauner.com>"]
+edition = "2018"
 
 [dependencies]
 blake2-rfc = "0.2.18"

lighthouse/main.rs

@@ -13,7 +13,7 @@ mod config;
 use std::path::PathBuf;
 
 use clap::{App, Arg};
-use config::LighthouseConfig;
+use crate::config::LighthouseConfig;
 use slog::Drain;
 
 fn main() {