From a4ea0737b25ae4953e16f3b87ebaa84e8994c745 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Tue, 16 Feb 2016 17:54:34 +0100
Subject: [PATCH] Fixed some tests

---
 util/src/network/host.rs  |  6 +++---
 util/src/network/tests.rs | 10 ++++++----
 util/src/sha3.rs          |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/util/src/network/host.rs b/util/src/network/host.rs
index 24f24fc6f..140625eea 100644
--- a/util/src/network/host.rs
+++ b/util/src/network/host.rs
@@ -493,8 +493,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 			};
 			match TcpStream::connect(&address) {
 				Ok(socket) => socket,
-				Err(_) => {
-					warn!("Cannot connect to node");
+				Err(e) => {
+					warn!("Can't connect to node: {:?}", e);
 					return;
 				}
 			}
@@ -769,9 +769,9 @@ impl<Message> IoHandler<NetworkIoMessage<Message>> for Host<Message> where Messa
 	/// Initialize networking
 	fn initialize(&self, io: &IoContext<NetworkIoMessage<Message>>) {
 		io.register_stream(TCP_ACCEPT).expect("Error registering TCP listener");
-		io.register_stream(DISCOVERY).expect("Error registering UDP listener");
 		io.register_timer(IDLE, MAINTENANCE_TIMEOUT).expect("Error registering Network idle timer");
 		if self.discovery.is_some() {
+			io.register_stream(DISCOVERY).expect("Error registering UDP listener");
 			io.register_timer(DISCOVERY_REFRESH, 7200).expect("Error registering discovery timer");
 			io.register_timer(DISCOVERY_ROUND, 300).expect("Error registering discovery timer");
 		}
diff --git a/util/src/network/tests.rs b/util/src/network/tests.rs
index a3d5290c9..925c95396 100644
--- a/util/src/network/tests.rs
+++ b/util/src/network/tests.rs
@@ -92,16 +92,18 @@ fn net_service() {
 #[test]
 fn net_connect() {
 	let key1 = KeyPair::create().unwrap();
-	let mut config1 = NetworkConfiguration::new_with_port(30344);
+	let mut config1 = NetworkConfiguration::new_with_port(30354);
 	config1.use_secret = Some(key1.secret().clone());
+	config1.nat_enabled = false;
 	config1.boot_nodes = vec![ ];
-	let mut config2 = NetworkConfiguration::new_with_port(30345);
-	config2.boot_nodes = vec![ format!("enode://{}@127.0.0.1:30344", key1.public().hex()) ];
+	let mut config2 = NetworkConfiguration::new_with_port(30355);
+	config2.boot_nodes = vec![ format!("enode://{}@127.0.0.1:30354", key1.public().hex()) ];
+	config2.nat_enabled = false;
 	let mut service1 = NetworkService::<TestProtocolMessage>::start(config1).unwrap();
 	let mut service2 = NetworkService::<TestProtocolMessage>::start(config2).unwrap();
 	let handler1 = TestProtocol::register(&mut service1);
 	let handler2 = TestProtocol::register(&mut service2);
-	while !handler1.got_packet() && !handler2.got_packet() {
+	while !handler1.got_packet() && !handler2.got_packet() && (service1.stats().sessions() == 0 || service2.stats().sessions() == 0) {
 		thread::sleep(Duration::from_millis(50));
 	}
 	assert!(service1.stats().sessions() >= 1);
diff --git a/util/src/sha3.rs b/util/src/sha3.rs
index 4079e8ba4..7e8382250 100644
--- a/util/src/sha3.rs
+++ b/util/src/sha3.rs
@@ -66,7 +66,7 @@ impl<T> Hashable for T where T: BytesConvertable {
 
 #[test]
 fn sha3_empty() {
-	assert_eq!((&[0u8; 0]).sha3(), SHA3_EMPTY);
+	assert_eq!([0u8; 0].sha3(), SHA3_EMPTY);
 }
 #[test]
 fn sha3_as() {