Merge branch 'master' into dapps-https

Conflicts:
	Cargo.lock

dapps/src/lib.rs

@@ -72,6 +72,8 @@ mod rpc;
 mod api;
 mod proxypac;
 mod url;
+#[cfg(test)]
+mod tests;
 
 pub use self::apps::urlhint::ContractClient;
 
@@ -206,6 +208,12 @@ impl Server {
 	pub fn set_panic_handler<F>(&self, handler: F) where F : Fn() -> () + Send + 'static {
 		*self.panic_handler.lock().unwrap() = Some(Box::new(handler));
 	}
+
+	#[cfg(test)]
+	/// Returns address that this server is bound to.
+	pub fn addr(&self) -> &SocketAddr {
+		self.server.as_ref().expect("server is always Some at the start; it's consumed only when object is dropped; qed").addr()
+	}
 }
 
 impl Drop for Server {
@@ -240,7 +248,7 @@ pub fn random_filename() -> String {
 }
 
 #[cfg(test)]
-mod tests {
+mod util_tests {
 	use super::Server;
 
 	#[test]