From 653b2509608244bd96e854edb35ffce343644ca4 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Thu, 27 Oct 2016 12:06:24 +0300
Subject: [PATCH] fixed style && unwraps

---
 db/src/test_storage.rs |  4 ++--
 sync/src/local_node.rs | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/db/src/test_storage.rs b/db/src/test_storage.rs
index 0a0463bc..6bc76b02 100644
--- a/db/src/test_storage.rs
+++ b/db/src/test_storage.rs
@@ -112,7 +112,7 @@ impl Store for TestStorage {
 			},
 			Entry::Vacant(entry) => {
 				entry.insert(block.clone());
-			}
+			},
 		}
 		match data.best_block_number {
 			Some(best_block_number) => {
@@ -122,7 +122,7 @@ impl Store for TestStorage {
 			None => {
 				data.best_block_number = Some(0);
 				data.heights.insert(0, hash);
-			}
+			},
 		}
 
 		Ok(())
diff --git a/sync/src/local_node.rs b/sync/src/local_node.rs
index ea94ddb2..d8c84488 100644
--- a/sync/src/local_node.rs
+++ b/sync/src/local_node.rs
@@ -176,10 +176,14 @@ impl LocalNode {
 						}).collect()
 				};
 
-				let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
-
-				trace!(target: "sync", "Querying {} unknown blocks from peer#{}", getdata.inventory.len(), peer_index);
-				connection.send_getdata(&getdata);
+				match self.peers.get_mut(&peer_index) {
+					Some(connection) => {
+						let connection = &mut *connection.lock();
+						trace!(target: "sync", "Querying {} unknown blocks from peer#{}", getdata.inventory.len(), peer_index);
+						connection.send_getdata(&getdata);
+					}
+					_ => (),
+				}
 			}
 			SynchronizationTask::RequestInventory(peer_index) => {
 				let block_locator_hashes = self.chain.read().block_locator_hashes();
@@ -189,11 +193,15 @@ impl LocalNode {
 					hash_stop: H256::default(),
 				};
 
-				let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
-
-				trace!(target: "sync", "Querying full inventory from peer#{}", peer_index);
-				trace!(target: "sync", "Synchronization state: sync = {:?}", self.sync.information());
-				connection.send_getblocks(&getblocks);
+				match self.peers.get_mut(&peer_index) {
+					Some(connection) => {
+						let connection = &mut *connection.lock();
+						trace!(target: "sync", "Querying full inventory from peer#{}", peer_index);
+						trace!(target: "sync", "Synchronization state: sync = {:?}", self.sync.information());
+						connection.send_getblocks(&getblocks);
+					},
+					_ => (),
+				}
 			},
 			SynchronizationTask::RequestBestInventory(peer_index) => {
 				let block_locator_hashes = self.chain.read().best_block_locator_hashes();
@@ -203,11 +211,15 @@ impl LocalNode {
 					hash_stop: H256::default(),
 				};
 
-				let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
-
-				trace!(target: "sync", "Querying best inventory from peer#{}", peer_index);
-				trace!(target: "sync", "Synchronization state: {:?}", self.sync.information());
-				connection.send_getblocks(&getblocks);
+				match self.peers.get_mut(&peer_index) {
+					Some(connection) => {
+						let connection = &mut *connection.lock();
+						trace!(target: "sync", "Querying best inventory from peer#{}", peer_index);
+						trace!(target: "sync", "Synchronization state: {:?}", self.sync.information());
+						connection.send_getblocks(&getblocks);
+					},
+					_ => (),
+				}
 			},
 		}
 	}