gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-19 21:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct status fork digest (#1016)

Browse Source 
* Correct status fork digest

* Correct port issues with tests
This commit is contained in:
Age Manning
2020-04-18 11:45:52 +10:00
committed by GitHub
parent 62d7a71fd9
commit f9e8dad1fb
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
beacon_node/eth2-libp2p/tests/common/mod.rs
View File

@@ -99,13 +99,9 @@ pub fn get_enr(node: &LibP2PService<E>) -> Enr {
// Returns `n` libp2p peers in fully connected topology.
#[allow(dead_code)]
pub fn build_full_mesh(
log: slog::Logger,
n: usize,
start_port: Option<u16>,
) -> Vec<LibP2PService<E>> {
let base_port = start_port.unwrap_or(10000);
let mut nodes: Vec<LibP2PService<E>> = (base_port..base_port + n as u16)
pub fn build_full_mesh(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
let mut nodes: Vec<LibP2PService<E>> = (0..n)
.map(|_| unused_port("tcp").unwrap())
.map(|p| build_libp2p_instance(p, vec![], None, log.clone()))
.collect();
let multiaddrs: Vec<Multiaddr> = nodes
@@ -149,9 +145,9 @@ pub fn build_node_pair(
// Returns `n` peers in a linear topology
#[allow(dead_code)]
pub fn build_linear(log: slog::Logger, n: usize, start_port: Option<u16>) -> Vec<LibP2PService<E>> {
let base_port = start_port.unwrap_or(9000);
let mut nodes: Vec<LibP2PService<E>> = (base_port..base_port + n as u16)
pub fn build_linear(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
let mut nodes: Vec<LibP2PService<E>> = (0..n)
.map(|_| unused_port("tcp").unwrap())
.map(|p| build_libp2p_instance(p, vec![], None, log.clone()))
.collect();
let multiaddrs: Vec<Multiaddr> = nodes

6
beacon_node/eth2-libp2p/tests/gossipsub_tests.rs
View File

@@ -25,8 +25,7 @@ fn test_gossipsub_forward() {
let log = common::build_log(Level::Info, false);
let num_nodes = 20;
let base_port = 54236;
let mut nodes = common::build_linear(log.clone(), num_nodes, Some(base_port));
let mut nodes = common::build_linear(log.clone(), num_nodes);
let mut received_count = 0;
let spec = E::default_spec();
let empty_block = BeaconBlock::empty(&spec);
@@ -99,8 +98,7 @@ 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 base_port = 5264;
let mut nodes = common::build_full_mesh(log, num_nodes, Some(base_port));
let mut nodes = common::build_full_mesh(log, num_nodes);
let mut publishing_node = nodes.pop().unwrap();
let spec = E::default_spec();
let empty_block = BeaconBlock::empty(&spec);