Variety of small p2p fixes to block sync

Adds a couple utility function to p2p server to check whether
we're already connected to a peer before trying again. Other
very minor fixes and logging improvements.

grin/src/adapters.rs

@@ -94,10 +94,11 @@ impl NetAdapter for NetToChainAdapter {
 				Ok(_) => {
 					added_hs.push(bh.hash());
 				}
-				Err(chain::Error::Unfit(_)) => {
+				Err(chain::Error::Unfit(s)) => {
-					info!("Received unfit block header {} at {}.",
+					info!("Received unfit block header {} at {}: {}.",
 					      bh.hash(),
-					      bh.height);
+					      bh.height,
+					      s);
 				}
 				Err(chain::Error::StoreErr(e)) => {
 					error!("Store error processing block header {}: {:?}", bh.hash(), e);

grin/src/seed.rs

@@ -98,16 +98,20 @@ impl Seeder {
 					let mut peers = peer_store.find_peers(p2p::State::Healthy,
 					                                      p2p::UNKNOWN,
 					                                      (2 * PEER_MAX_COUNT) as usize);
-					debug!("Got {} more peers from db, trying to connect.", peers.len());
+					peers.retain(|p| !p2p_server.is_known(p.addr));
-					thread_rng().shuffle(&mut peers[..]);
+					if peers.len() > 0 {
-					let sz = min(PEER_PREFERRED_COUNT as usize, peers.len());
+						debug!("Got {} more peers from db, trying to connect.", peers.len());
-					for p in &peers[0..sz] {
+						thread_rng().shuffle(&mut peers[..]);
-						tx.send(p.addr).unwrap();
+						let sz = min(PEER_PREFERRED_COUNT as usize, peers.len());
+						for p in &peers[0..sz] {
+							tx.send(p.addr).unwrap();
+						}
 					}
 				}
 				Ok(())
 			})
 			.map_err(|e| e.to_string());
+
 		Box::new(mon_loop)
 	}
 
@@ -223,15 +227,17 @@ fn connect_and_req(capab: p2p::Capabilities,
                    addr: SocketAddr)
                    -> Box<Future<Item = (), Error = ()>> {
 	let fut = p2p.connect_peer(addr, h)
-		.and_then(move |p| {
+		.then(move |p| {
-			if let Some(p) = p {
+			match p {
-				p.send_peer_request(capab);
+				Ok(Some(p)) => {
+					p.send_peer_request(capab);
+				}
+				Err(e) => {
+					error!("Peer request error: {:?}", e);
+				}
+				_ => {}
 			}
 			Ok(())
-		})
-		.map_err(|e| {
-			error!("Peer request error {:?}", e);
-			()
 		});
 	Box::new(fut)
 }

grin/src/server.rs

@@ -30,6 +30,7 @@ use api;
 use chain;
 use chain::ChainStore;
 use core;
+use core::core::hash::Hashed;
 use miner;
 use p2p;
 use seed;
@@ -174,5 +175,14 @@ fn store_head(config: &ServerConfig)
 		}
 		Err(e) => return Err(Error::Store(e)),
 	};
+
+	let head = chain_store.head()?;
+	let head_header = chain_store.head_header()?;
+	info!("Starting server with head {} at {} and header head {} at {}",
+	      head.last_block_h,
+	      head.height,
+	      head_header.hash(),
+	      head_header.height);
+
 	Ok((Arc::new(chain_store), head))
 }

grin/src/sync.rs

@@ -66,7 +66,7 @@ impl Syncer {
 			if pc > 3 {
 				break;
 			}
-			if pc > 0 && (Instant::now() - start > Duration::from_secs(15)) {
+			if pc > 0 && (Instant::now() - start > Duration::from_secs(10)) {
 				break;
 			}
 			thread::sleep(Duration::from_millis(200));
@@ -178,7 +178,10 @@ impl Syncer {
 		let peer = self.p2p.most_work_peer();
 		let locator = self.get_locator(&tip)?;
 		if let Some(p) = peer {
-			debug!("Asking peer {} for more block headers.", p.info.addr);
+			debug!("Asking peer {} for more block headers starting from {} at {}.",
+			       p.info.addr,
+			       tip.last_block_h,
+			       tip.height);
 			p.send_header_request(locator)?;
 		} else {
 			warn!("Could not get most worked peer to request headers.");

p2p/src/server.rs

@@ -145,16 +145,16 @@ impl Server {
 	                    addr: SocketAddr,
 	                    h: reactor::Handle)
 	                    -> Box<Future<Item = Option<Arc<Peer>>, Error = Error>> {
-		for p in self.peers.read().unwrap().deref() {
+		if let Some(p) = self.get_peer(addr) {
 			// if we're already connected to the addr, just return the peer
-			if p.info.addr == addr {
+			return Box::new(future::ok(Some(p)));
-				return Box::new(future::ok(Some((*p).clone())));
-			}
 		}
-		// asked to connect to ourselves
+		if self.is_self(addr) {
-		if addr.ip() == self.config.host && addr.port() == self.config.port {
+			// asked to connect to ourselves
 			return Box::new(future::ok(None));
 		}
+
+		// cloneapalooza
 		let peers = self.peers.clone();
 		let adapter1 = self.adapter.clone();
 		let adapter2 = self.adapter.clone();
@@ -186,6 +186,27 @@ impl Server {
 		Box::new(request)
 	}
 
+	/// Check if the server already knows this peer (is already connected). In
+	/// addition we consider to know ourselves.
+	pub fn is_known(&self, addr: SocketAddr) -> bool {
+		self.get_peer(addr).is_some() || self.is_self(addr)
+	}
+
+	/// Whether the provided address is ourselves.
+	pub fn is_self(&self, addr: SocketAddr) -> bool {
+		addr.ip() == self.config.host && addr.port() == self.config.port
+	}
+
+	/// Get a peer we're connected to by address.
+	pub fn get_peer(&self, addr: SocketAddr) -> Option<Arc<Peer>> {
+		for p in self.peers.read().unwrap().deref() {
+			if p.info.addr == addr {
+				return Some((*p).clone());
+			}
+		}
+		None
+	}
+
 	/// Have the server iterate over its peer list and prune all peers we have
 	/// lost connection to or have been deemed problematic. The removed peers
 	/// are returned.

p2p/src/store.rs

@@ -37,6 +37,7 @@ enum_from_primitive! {
 }
 
 /// Data stored for any given peer we've encountered.
+#[derive(Debug)]
 pub struct PeerData {
 	/// Network address of the peer.
 	pub addr: SocketAddr,