Merge latest master

This commit is contained in:
Age Manning
2020-04-17 18:25:56 +10:00
8 changed files with 90 additions and 29 deletions

View File

@@ -25,7 +25,8 @@ fn test_gossipsub_forward() {
let log = common::build_log(Level::Info, false);
let num_nodes = 20;
let mut nodes = common::build_linear(log.clone(), num_nodes, Some(19000));
let base_port = 54236;
let mut nodes = common::build_linear(log.clone(), num_nodes, Some(base_port));
let mut received_count = 0;
let spec = E::default_spec();
let empty_block = BeaconBlock::empty(&spec);
@@ -98,7 +99,8 @@ fn test_gossipsub_full_mesh_publish() {
// as nodes may get pruned out of the mesh before the gossipsub message
// is published to them.
let num_nodes = 12;
let mut nodes = common::build_full_mesh(log, num_nodes, Some(11320));
let base_port = 5264;
let mut nodes = common::build_full_mesh(log, num_nodes, Some(base_port));
let mut publishing_node = nodes.pop().unwrap();
let spec = E::default_spec();
let empty_block = BeaconBlock::empty(&spec);