Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,26 @@ fn main() {
********************/

let mut message_rcv: Message;
let peer_addr = match config.peer {
Some(ref p) => format!("{}:{}", p.ip, p.port),
let mut peer = match config.peer {
Some(ref p) => {
let addr = format!("{}:{}", p.ip, p.port);
info!("Connecting to peer {}", addr);
Peer::new(addr, network.magic_bytes).expect("failed to connect to configured peer")
}
None => network
.dns_seeds
.iter()
.find_map(|seed| {
.flat_map(|seed| {
(*seed, network.port)
.to_socket_addrs()
.ok()?
.next()
.map(|addr| addr.to_string())
.unwrap_or_else(|_| vec![].into_iter())
})
.find_map(|addr| {
info!("Trying peer {}", addr);
Peer::new(addr.to_string(), network.magic_bytes).ok()
})
.expect("no DNS seed resolved to a valid address"),
.expect("could not connect to any peer from DNS seeds"),
};
info!("Connecting to peer {}", peer_addr);
let mut peer = Peer::new(peer_addr, network.magic_bytes);
let mut current_height: u32 = 0;

let mut hash = network.genesis_hash.to_vec();
Expand Down
3 changes: 1 addition & 2 deletions src/networks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@ impl Network {
testnet: true,
magic_bytes: MagicBytes::LITECOIN_TESTNET,
aux_pow: false,
port: 19333,
port: 19335,
genesis_hash: [
73, 102, 98, 90, 75, 40, 81, 217, 253, 238, 19, 158, 86, 33, 26, 13, 136, 87, 95, 89,
237, 129, 111, 245, 230, 166, 61, 235, 78, 62, 41, 160,
],
dns_seeds: &[
"seed-b.litecoin.loshan.co.uk",
"dnsseed-testnet.thrasher.io",
"testnet-seed.ltc.xurious.com",
],
Expand Down
7 changes: 4 additions & 3 deletions src/peer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ pub struct Peer {
}

impl Peer {
pub fn new(ip: String, magic_bytes: [u8; 4]) -> Self {
let stream = TcpStream::connect(&ip).expect("Create TcpStream");
pub fn new(ip: String, magic_bytes: [u8; 4]) -> Result<Self, Box<dyn Error>> {
let addr: std::net::SocketAddr = ip.parse()?;
let stream = TcpStream::connect_timeout(&addr, Duration::from_secs(5))?;

let (tx, rx) = channel::<Message>();

Expand All @@ -35,7 +36,7 @@ impl Peer {

peer.start_thread();

return peer;
Ok(peer)
}

pub fn start_thread(&mut self) -> thread::JoinHandle<()> {
Expand Down
Loading