Fix the brainwallet functionality. (#2994) (#3005)

openethereum · Oct 31, 2016 · 93327e8 · 93327e8
1 parent 54da6ae
commit 93327e8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ethkey/src/brain.rs b/ethkey/src/brain.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use keccak::Keccak256;
-use super::{KeyPair, Error, Generator, Secret};
+use super::{KeyPair, Error, Generator};
 
 /// Simple brainwallet.
 pub struct Brain(String);
@@ -38,9 +38,9 @@ impl Generator for Brain {
 			match i > 16384 {
 				false => i += 1,
 				true => {
-					let result = KeyPair::from_secret(Secret::from(secret.clone()));
-					if result.is_ok() {
-						return result
+					let result = KeyPair::from_secret(secret.clone().into());
+					if result.as_ref().ok().map_or(false, |r| r.address()[0] == 0) {
+						return result;
 					}
 				},
 			}