More style

src/crypto.rs

@@ -313,8 +313,6 @@ pub mod aes {
 
 #[cfg(test)]
 mod tests {
-
-	use std::str::FromStr;
 	use hash::*;
 	use crypto::*;
 

src/network/connection.rs

@@ -1,4 +1,3 @@
-#![allow(dead_code)] //TODO: remove this after everything is done
 use std::collections::VecDeque;
 use mio::{Token, EventSet, EventLoop, Timeout, PollOpt, TryRead, TryWrite};
 use mio::tcp::*;
@@ -183,7 +182,6 @@ impl EncryptedConnection {
 
 		key_material.sha3().copy_to(&mut key_material[32..64]);
 		let mac_encoder = EcbEncryptor::new(AesSafe256Encryptor::new(&key_material[32..64]), NoPadding);
-		println!("SESSION key: {}", H256::from_slice(&key_material[32..64]).hex());
 
 		let mut egress_mac = Keccak::new_keccak256();
 		let mut mac_material = &H256::from_slice(&key_material[32..64]) ^ &handshake.remote_nonce;
@@ -292,17 +290,10 @@ impl EncryptedConnection {
 		let mut prev = H128::new();
 		mac.clone().finalize(&mut prev);
 		let mut enc = H128::new();
-		println!("before: {}", prev.hex());
 		mac_encoder.encrypt(&mut RefReadBuffer::new(&prev), &mut RefWriteBuffer::new(&mut enc), true).unwrap();
 		mac_encoder.reset();
-		println!("after {}", enc.hex());
 
-		if !seed.is_empty() {
+		enc = enc ^ if seed.is_empty() { prev } else { H128::from_slice(seed) };
-			enc = enc ^ H128::from_slice(seed);
-		}
-		else {
-			enc = enc ^ prev;
-		}
 		mac.update(&enc);
 	}
 
@@ -349,7 +340,7 @@ impl EncryptedConnection {
 }
 
 #[test]
-pub fn ctest() {
+pub fn test_encryption() {
 	use hash::*;
 	use std::str::FromStr;
 	let key = H256::from_str("2212767d793a7a3d66f869ae324dd11bd17044b82c9f463b8a541a4d089efec5").unwrap();
@@ -363,7 +354,6 @@ pub fn ctest() {
 	let mut encoder = EcbEncryptor::new(AesSafe256Encryptor::new(&key), NoPadding);
 	encoder.encrypt(&mut RefReadBuffer::new(&before), &mut RefWriteBuffer::new(&mut got), true).unwrap();
 	encoder.reset();
-	println!("got: {} ", got.hex());
 	assert_eq!(got, after);
 	got = H128::new();
 	encoder.encrypt(&mut RefReadBuffer::new(&before2), &mut RefWriteBuffer::new(&mut got), true).unwrap();

src/network/host.rs

@@ -1,4 +1,3 @@
-//TODO: remove all unwraps
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::collections::{HashMap};
 use std::hash::{Hash, Hasher};
@@ -28,8 +27,8 @@ pub type TimerToken = usize;
 struct NetworkConfiguration {
 	listen_address: SocketAddr,
 	public_address: SocketAddr,
-    no_nat: bool,
+	nat_enabled: bool,
-    no_discovery: bool,
+	discovery_enabled: bool,
 	pin: bool,
 }
 
@@ -38,8 +37,8 @@ impl NetworkConfiguration {
 		NetworkConfiguration {
 			listen_address: SocketAddr::from_str("0.0.0.0:30304").unwrap(),
 			public_address: SocketAddr::from_str("0.0.0.0:30304").unwrap(),
-            no_nat: false,
+			nat_enabled: true,
-            no_discovery: false,
+			discovery_enabled: true,
 			pin: false,
 		}
 	}
@@ -54,7 +53,6 @@ pub struct NodeEndpoint {
 
 impl NodeEndpoint {
 	fn from_str(s: &str) -> Result<NodeEndpoint, Error> {
-		println!("{:?}", s);
 		let address = s.to_socket_addrs().map(|mut i| i.next());
 		match address {
 			Ok(Some(a)) => Ok(NodeEndpoint {
@@ -307,10 +305,6 @@ impl Host {
 		let listener = TcpListener::bind(&addr).unwrap();
 		// Start listening for incoming connections
 		event_loop.register(&listener, Token(TCP_ACCEPT), EventSet::readable(), PollOpt::edge()).unwrap();
-        // Setup the client socket
-        //let sock = TcpStream::connect(&addr).unwrap();
-        // Register the socket
-        //self.event_loop.register(&sock, CLIENT, EventSet::readable(), PollOpt::edge()).unwrap();
 		let idle_timeout = event_loop.timeout_ms(Token(IDLE), 1000).unwrap(); //TODO: check delay
 		// open the udp socket
 		let udp_socket = UdpSocket::bound(&addr).unwrap();
@@ -326,7 +320,6 @@ impl Host {
 				protocol_version: 4,
 				client_version: "parity".to_string(),
 				listen_port: port,
-				//capabilities: vec![ CapabilityInfo { protocol: "eth".to_string(), version: 63 }],
 				capabilities: Vec::new(),
 			},
 			_udp_socket: udp_socket,
@@ -434,8 +427,6 @@ impl Host {
 			let node = self.nodes.get_mut(id).unwrap();
 			node.last_attempted = Some(::time::now());
 
-
-			//blog(NetConnect) << "Attempting connection to node" << _p->id << "@" << ep << "from" << id();
 			match TcpStream::connect(&node.endpoint.address) {
 				Ok(socket) => socket,
 				Err(_) => {