cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Change some ShardAndCommittee -> ShardCommittee

Browse Source
This commit is contained in:
Paul Hauner 2018-12-13 12:28:37 +11:00
parent 6847e68c5e
commit 4f0a223579
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_chain/types/src/crystallized_state.rs
View File

@ -1,5 +1,5 @@
use super::crosslink_record::CrosslinkRecord; use super::crosslink_record::CrosslinkRecord;
use super::shard_and_committee::ShardAndCommittee; use super::shard_committee::ShardCommittee;
use super::validator_record::ValidatorRecord; use super::validator_record::ValidatorRecord;
use super::Hash256; use super::Hash256;
@ -12,7 +12,7 @@ pub struct CrystallizedState {
pub last_finalized_slot: u64, pub last_finalized_slot: u64,
pub last_justified_slot: u64, pub last_justified_slot: u64,
pub justified_streak: u64, pub justified_streak: u64,
pub shard_and_committee_for_slots: Vec<Vec<ShardAndCommittee>>, pub shard_and_committee_for_slots: Vec<Vec<ShardCommittee>>,
pub deposits_penalized_in_period: Vec<u32>, pub deposits_penalized_in_period: Vec<u32>,
pub validator_set_delta_hash_chain: Hash256, pub validator_set_delta_hash_chain: Hash256,
pub pre_fork_version: u32, pub pre_fork_version: u32,

2
beacon_chain/types/src/shard_committee.rs
View File

@ -21,7 +21,7 @@ mod tests {
#[test] #[test]
fn test_shard_and_committee_zero() { fn test_shard_and_committee_zero() {
let s = ShardAndCommittee::zero(); let s = ShardCommittee::zero();
assert_eq!(s.shard, 0); assert_eq!(s.shard, 0);
assert_eq!(s.committee.len(), 0); assert_eq!(s.committee.len(), 0);
} }

6
beacon_chain/validator_shuffling/src/shuffle.rs
View File

@ -3,10 +3,10 @@ use std::cmp::min;
use active_validators::active_validator_indices; use active_validators::active_validator_indices;
use honey_badger_split::SplitExt; use honey_badger_split::SplitExt;
use spec::ChainSpec; use spec::ChainSpec;
use types::{ShardAndCommittee, ValidatorRecord}; use types::{ShardCommittee, ValidatorRecord};
use vec_shuffle::{shuffle, ShuffleErr}; use vec_shuffle::{shuffle, ShuffleErr};
type DelegatedCycle = Vec<Vec<ShardAndCommittee>>; type DelegatedCycle = Vec<Vec<ShardCommittee>>;
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum ValidatorAssignmentError { pub enum ValidatorAssignmentError {
@ -85,7 +85,7 @@ fn generate_cycle(
slot_indices slot_indices
.honey_badger_split(committees_per_slot) .honey_badger_split(committees_per_slot)
.enumerate() .enumerate()
.map(|(j, shard_indices)| ShardAndCommittee { .map(|(j, shard_indices)| ShardCommittee {
shard: ((shard_start + j) % shard_count) as u16, shard: ((shard_start + j) % shard_count) as u16,
committee: shard_indices.to_vec(), committee: shard_indices.to_vec(),
}).collect() }).collect()