Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #506 - use OS-assigned port in peer_handshake (#570)

Browse source
This commit is contained in:
Matthew Slipper 2018-01-02 17:53:50 -08:00 committed by Ignotus Peverell
parent 23e045d9b7
commit e83e696a6f
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
p2p/tests/peer_handshake.rs
View file

@ -19,6 +19,7 @@ extern crate grin_p2p as p2p;
extern crate tokio_core; extern crate tokio_core;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::net::TcpListener;
use std::sync::Arc; use std::sync::Arc;
use std::time; use std::time;
@ -31,13 +32,24 @@ use core::core::target::Difficulty;
use core::core::hash::Hash; use core::core::hash::Hash;
use p2p::Peer; use p2p::Peer;
fn open_port() -> u16 {
// use port 0 to allow the OS to assign an open port
// TcpListener's Drop impl will unbind the port as soon as
// listener goes out of scope
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
listener.local_addr().unwrap().port()
}
// Starts a server and connects a client peer to it to check handshake, // Starts a server and connects a client peer to it to check handshake,
// followed by a ping/pong exchange to make sure the connection is live. // followed by a ping/pong exchange to make sure the connection is live.
#[test] #[test]
fn peer_handshake() { fn peer_handshake() {
let mut evtlp = Core::new().unwrap(); let mut evtlp = Core::new().unwrap();
let handle = evtlp.handle(); let handle = evtlp.handle();
let p2p_conf = p2p::P2PConfig::default(); let p2p_conf = p2p::P2PConfig {
host: "0.0.0.0".parse().unwrap(),
port: open_port()
};
let net_adapter = Arc::new(p2p::DummyAdapter {}); let net_adapter = Arc::new(p2p::DummyAdapter {});
let pool = CpuPool::new(1); let pool = CpuPool::new(1);
let server = p2p::Server::new( let server = p2p::Server::new(
@ -59,7 +71,6 @@ fn peer_handshake() {
timeout timeout
.from_err() .from_err()
.and_then(move |_| { .and_then(move |_| {
let p2p_conf = p2p::P2PConfig::default();
let addr = SocketAddr::new(p2p_conf.host, p2p_conf.port); let addr = SocketAddr::new(p2p_conf.host, p2p_conf.port);
let socket = let socket =
TcpStream::connect(&addr, &phandle).map_err(|e| p2p::Error::Connection(e)); TcpStream::connect(&addr, &phandle).map_err(|e| p2p::Error::Connection(e));