Backporting to beta (#3623)

* Ropsten network (#3539)

* Ropsten network

* Sorted premine

* Comas

* Removed trailing coma

* --testnet set to ropset

* New registry contract address for ropsten (#3549)

* New registry for ropsten

* Registry address

* Registry with payable modifier

* Fix panic on importing own invalid transaction (#3550)

* Use patched MIO

* Trim whitespace from recovery phrase

* v1.4.5

* Appending logs by default

* Fixing phrases generated on windows

* Manually add \r to Windows phrases pre 1.4.4

* < 1.4.5

* Update test, fix number. (#3612)

* Set default tx price to 0.0025 USD

* Only support 1.4.x dictionary


Former-commit-id: 793003af5ff14bccb34e24b8b57897762647e03d

ethstore/src/random.rs

@@ -47,7 +47,7 @@ impl Random for [u8; 32] {
 pub fn random_phrase(words: usize) -> String {
 	lazy_static! {
 		static ref WORDS: Vec<String> = String::from_utf8_lossy(include_bytes!("../res/wordlist.txt"))
-			.split("\n")
+			.lines()
 			.map(|s| s.to_owned())
 			.collect();
 	}
@@ -55,8 +55,19 @@ pub fn random_phrase(words: usize) -> String {
 	(0..words).map(|_| rng.choose(&WORDS).unwrap()).join(" ")
 }
 
-#[test]
-fn should_produce_right_number_of_words() {
-	let p = random_phrase(10);
-	assert_eq!(p.split(" ").count(), 10);
-}
+#[cfg(test)]
+mod tests {
+	use super::random_phrase;
+
+	#[test]
+	fn should_produce_right_number_of_words() {
+		let p = random_phrase(10);
+		assert_eq!(p.split(" ").count(), 10);
+	}
+
+	#[test]
+	fn should_not_include_carriage_return() {
+		let p = random_phrase(10);
+		assert!(!p.contains('\r'), "Carriage return should be trimmed.");
+	}
+}