Consistent style, version bump. (openethereum#9)

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+indent_style=space
+indent_size=2
+tab_width=8
+end_of_line=lf
+charset=utf-8
+trim_trailing_whitespace=true
+max_line_length=120
+insert_final_newline=true
+
+[*.rs]
+indent_style=tab
+indent_size=tab
+tab_width=4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parity-wordlist"
-version = "1.1.0"
+version = "1.2.0"
 description = "Word list used to generate brain wallets for Parity."
 license = "GPL-3.0"
 authors = ["Parity Technologies <[email protected]>"]

README.md

@@ -8,7 +8,7 @@ Parity Brain Wallets wordlist library
 # Cargo.toml
 
 [dependencies]
-parity-wordlist = "1.1"
+parity-wordlist = "1.2"
 ```
 
 ```rust

src/lib.rs

@@ -44,33 +44,33 @@ pub fn random_phrase(no_of_words: usize) -> String {
 /// Phrase Validation Error
 #[derive(Debug, Clone, PartialEq)]
 pub enum Error {
-  /// Phrase is shorter than it was expected.
-  PhraseTooShort(usize),
-  /// Phrase contains a word that doesn't come from our dictionary.
-  WordNotFromDictionary(String),
+	/// Phrase is shorter than it was expected.
+	PhraseTooShort(usize),
+	/// Phrase contains a word that doesn't come from our dictionary.
+	WordNotFromDictionary(String),
 }
 
 /// Validates given phrase and checks if:
 /// 1. All the words are coming from the dictionary.
 /// 2. There are at least `expected_no_of_words` in the phrase.
 pub fn validate_phrase(phrase: &str, expected_no_of_words: usize) -> Result<(), Error> {
 	lazy_static! {
-    static ref WORD_SET: HashSet<&'static str> = WORDS.iter().cloned().collect();
-  }
-
-  let mut len = 0;
-  for word in phrase.split_whitespace() {
-    len += 1;
-    if !WORD_SET.contains(word) {
-      return Err(Error::WordNotFromDictionary(word.into()));
-    }
-  }
-
-  if len < expected_no_of_words {
-    return Err(Error::PhraseTooShort(len));
-  }
-
-  return Ok(());
+		static ref WORD_SET: HashSet<&'static str> = WORDS.iter().cloned().collect();
+	}
+
+	let mut len = 0;
+	for word in phrase.split_whitespace() {
+		len += 1;
+		if !WORD_SET.contains(word) {
+			return Err(Error::WordNotFromDictionary(word.into()));
+		}
+	}
+
+	if len < expected_no_of_words {
+		return Err(Error::PhraseTooShort(len));
+	}
+
+	return Ok(());
 }
 
 #[cfg(test)]
@@ -89,13 +89,13 @@ mod tests {
 		assert!(!p.contains('\r'), "Carriage return should be trimmed.");
 	}
 
-  #[test]
-  fn should_validate_the_phrase() {
-    let p = random_phrase(10);
+	#[test]
+	fn should_validate_the_phrase() {
+		let p = random_phrase(10);
 
-    assert_eq!(validate_phrase(&p, 10), Ok(()));
-    assert_eq!(validate_phrase(&p, 12), Err(Error::PhraseTooShort(10)));
-    assert_eq!(validate_phrase("xxx", 0), Err(Error::WordNotFromDictionary("xxx".into())));
-  }
+		assert_eq!(validate_phrase(&p, 10), Ok(()));
+		assert_eq!(validate_phrase(&p, 12), Err(Error::PhraseTooShort(10)));
+		assert_eq!(validate_phrase("xxx", 0), Err(Error::WordNotFromDictionary("xxx".into())));
+	}
 }