From 03e75f509a29d2b7fe7b283ed5ff94ae02e00003 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 7 Nov 2017 18:40:25 +0100
Subject: [PATCH] Fix concerns

---
 datastore/Cargo.toml       |  3 ++-
 datastore/src/json_file.rs | 19 +++++++++++--------
 datastore/src/lib.rs       |  1 +
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/datastore/Cargo.toml b/datastore/Cargo.toml
index eccf68e1..a65c2f8c 100644
--- a/datastore/Cargo.toml
+++ b/datastore/Cargo.toml
@@ -1,10 +1,11 @@
 [package]
 name = "datastore"
 version = "0.1.0"
-authors = ["pierre <pierre.krieger1708@gmail.com>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
 base64 = "0.7"
 futures = "0.1"
+parking_lot = "0.4"
 serde_json = "1.0"
 tempfile = "2.2"
diff --git a/datastore/src/json_file.rs b/datastore/src/json_file.rs
index b9d2e7c9..c697d399 100644
--- a/datastore/src/json_file.rs
+++ b/datastore/src/json_file.rs
@@ -14,7 +14,7 @@ use std::io::Error as IoError;
 use std::io::ErrorKind as IoErrorKind;
 use std::io::Read;
 use std::path::PathBuf;
-use std::sync::Mutex;
+use parking_lot::Mutex;
 use tempfile::NamedTempFile;
 
 /// Implementation of `Datastore` that uses a single plain JSON file.
@@ -83,7 +83,7 @@ impl JsonFileDatastore {
         ))?;
         let mut temporary_file = NamedTempFile::new_in(self_path_parent)?;
 
-        let content = self.content.lock().unwrap();
+        let content = self.content.lock();
         to_writer(&mut temporary_file, &*content)?;
         temporary_file.sync_data()?;
 
@@ -101,12 +101,12 @@ impl JsonFileDatastore {
 
 impl Datastore for JsonFileDatastore {
     fn put(&self, key: Cow<str>, value: Vec<u8>) {
-        let mut content = self.content.lock().unwrap();
+        let mut content = self.content.lock();
         content.insert(key.into_owned(), Value::String(base64::encode(&value)));
     }
 
     fn get(&self, key: &str) -> Option<Vec<u8>> {
-        let content = self.content.lock().unwrap();
+        let content = self.content.lock();
         // If the JSON is malformed, we just ignore the value.
         content.get(key).and_then(|val| match val {
             &Value::String(ref s) => base64::decode(s).ok(),
@@ -115,12 +115,12 @@ impl Datastore for JsonFileDatastore {
     }
 
     fn has(&self, key: &str) -> bool {
-        let content = self.content.lock().unwrap();
+        let content = self.content.lock();
         content.contains_key(key)
     }
 
     fn delete(&self, key: &str) -> bool {
-        let mut content = self.content.lock().unwrap();
+        let mut content = self.content.lock();
         content.remove(key).is_some()
     }
 
@@ -128,7 +128,7 @@ impl Datastore for JsonFileDatastore {
         &'a self,
         query: Query,
     ) -> Box<Stream<Item = (String, Vec<u8>), Error = IoError> + 'a> {
-        let content = self.content.lock().unwrap();
+        let content = self.content.lock();
 
         let keys_only = query.keys_only;
 
@@ -151,10 +151,13 @@ impl Datastore for JsonFileDatastore {
             Some((key.clone(), value))
         }));
 
+        // `content_stream` reads from the content of the `Mutex`, so we need to clone the data
+        // into a `Vec` before returning.
         let collected = naive_apply_query(content_stream, query)
             .collect()
             .wait()
-            .unwrap();
+            .expect("can only fail if either `naive_apply_query` or `content_stream` produce \
+                     an error, which cann't happen");
         let output_stream = iter_ok(collected.into_iter());
         Box::new(output_stream) as Box<_>
     }
diff --git a/datastore/src/lib.rs b/datastore/src/lib.rs
index b496b778..9c99f0a9 100644
--- a/datastore/src/lib.rs
+++ b/datastore/src/lib.rs
@@ -1,6 +1,7 @@
 extern crate base64;
 #[macro_use]
 extern crate futures;
+extern crate parking_lot;
 extern crate serde_json;
 extern crate tempfile;