Adds list splitting function and begins delegation testing

This commit is contained in:
Age Manning 2018-10-03 18:47:18 +10:00
parent 57e3f8c465
commit 229351b38e
No known key found for this signature in database
GPG Key ID: 05EED64B79E06A93
2 changed files with 75 additions and 0 deletions

View File

@ -29,6 +29,19 @@ fn active_validator_indicies(
.collect()
}
/*
* splits a vector into chunks of size n. All postive n values are applicable,
* hence the honey_badger prefix.
*/
fn honey_badger_split<T: Clone>(list: &Vec<T>, n: usize) -> Vec<Vec<T>> {
let mut split_list: Vec<Vec<T>> = vec![];
let list_length = list.len();
for i in 0..n {
let partition = list.get(list_length*i/n..list_length*(i+1)/n).unwrap(); // cannot go out of bounds
split_list.push(partition.to_vec());
}
split_list
}
/*
* Delegates active validators into slots for a given cycle, given a random seed.
@ -75,9 +88,17 @@ fn generate_cycle(
min_committee_size: &usize)
-> Result<DelegatedCycle, TransitionError>
{
let validator_count = validator_indices.len();
let shard_count = shard_indices.len();
if shard_count / cycle_length == 0 {
return Err(TransitionError::InvalidInput(String::from("Number of
shards needs to be greater than
cycle length")));
}
let (committees_per_slot, slots_per_committee) = {
if validator_count >= cycle_length * min_committee_size {
let committees_per_slot = min(validator_count / cycle_length /
@ -217,6 +238,46 @@ mod tests {
assert_eq!(assigned_validators, validators, "Validator assignment incorrect");
assert_eq!(assigned_shards, shards, "Shard assignment incorrect");
let expected_shards_in_slots: Vec<Vec<usize>> = vec![
vec![0], vec![0], // Each line is 2 slots..
vec![1], vec![1],
vec![2], vec![2],
vec![3], vec![3],
vec![4], vec![4],
vec![5], vec![5],
vec![6], vec![6],
vec![7], vec![7],
vec![8], vec![8],
vec![9], vec![9],
];
// assert!(compare_shards_in_slots(&cycle, &expected_shards_in_slots));
assert_eq!(expected_shards_in_slots, shards_in_slots, "Shard assignment incorrect.")
}
#[test]
// Check that the committees per slot is upper bounded by shard count
fn test_generate_cycle_committees_bounded() {
let validator_count: usize = 101;
let shard_count: usize = 15;
let crosslinking_shard_start: usize = 0;
let cycle_length: usize = 10;
let min_committee_size: usize = 10;
let (validators, shards, result) = generate_cycle_helper(
&validator_count,
&shard_count,
&crosslinking_shard_start,
&cycle_length,
&min_committee_size);
let cycle = result.unwrap();
let assigned_validators = flatten_validators(&cycle);
let assigned_shards = flatten_and_dedup_shards(&cycle);
let shards_in_slots = flatten_shards_in_slots(&cycle);
print_cycle(&cycle);
assert_eq!(assigned_validators, validators, "Validator assignment incorrect");
assert_eq!(assigned_shards, shards, "Shard assignment incorrect");
let expected_shards_in_slots: Vec<Vec<usize>> = vec![
vec![0], vec![0], // Each line is 2 slots..
vec![1], vec![1],

View File

@ -20,6 +20,20 @@ impl ChainConfig {
}
}
pub fn validate(&self) -> bool {
// criteria that ensure the config is valid
// shard_count / cycle_length > 0 otherwise validator delegation
// will fail.
if self.shard_count / self.cycle_length as u16 == 0 {
return false;
}
true
}
#[cfg(test)]
pub fn super_fast_tests() -> Self {
Self {