Remove hex crate dependency

Author: stevenroose

Cargo.toml

@@ -20,4 +20,3 @@ serde_derive = "1"
 [dev-dependencies]
 bitcoin = { version= "0.23", features=["use-serde", "bitcoinconsensus"]}
 serde_json="1"
-hex = "0.3"

src/account.rs

@@ -880,12 +880,12 @@ mod test {
     use std::io::Read;
     use std::path::PathBuf;
 
+    use bitcoin::hashes::hex::FromHex;
     use bitcoin::blockdata::opcodes::all;
     use bitcoin::blockdata::script::Builder;
     use bitcoin::blockdata::transaction::{OutPoint, TxIn, TxOut};
     use bitcoin::network::constants::Network;
     use bitcoin::util::bip32::ChildNumber;
-    use hex::decode;
     use rand::Rng;
     use serde_json::Value;
 
@@ -1352,7 +1352,7 @@ mod test {
         let json: Value = serde_json::from_str(&data).unwrap();
         let tests = json.as_array().unwrap();
         for test in tests {
-            let seed = Seed(decode(test["seed"].as_str().unwrap()).unwrap());
+            let seed = Seed(Vec::<u8>::from_hex(test["seed"].as_str().unwrap()).unwrap());
             let master_private = context.master_private_key(Network::Bitcoin, &seed).unwrap();
             assert_eq!(
                 test["private"].as_str().unwrap(),

src/coins.rs

@@ -20,8 +20,7 @@
 
 use std::collections::HashMap;
 
-use bitcoin::Block;
-use bitcoin::{OutPoint, Script, Transaction, TxOut};
+use bitcoin::{Block, OutPoint, Script, Transaction, TxOut};
 use rand::thread_rng;
 
 use account::{KeyDerivation, MasterAccount};
@@ -321,6 +320,7 @@ mod test {
         time::{SystemTime, UNIX_EPOCH},
     };
 
+use bitcoin::hashes::hex::FromHex;
     use bitcoin::blockdata::constants::genesis_block;
     use bitcoin::blockdata::script::Builder;
     use bitcoin::util::bip32::ExtendedPubKey;
@@ -378,7 +378,7 @@ mod test {
 
     fn new_master() -> MasterAccount {
         let mut master = MasterAccount::from_encrypted(
-            hex::decode("e541bc73d9990b290cc4a8d8ff4592183171d1808a32695b1835aa3c12f50f34849a0dc5b730c507f19f22af393b5e5453e0974977922dbba513dadf81d364d8e204209ea02af35693b49b3b09191f01").unwrap().as_slice(),
+            Vec::<u8>::from_hex("e541bc73d9990b290cc4a8d8ff4592183171d1808a32695b1835aa3c12f50f34849a0dc5b730c507f19f22af393b5e5453e0974977922dbba513dadf81d364d8e204209ea02af35693b49b3b09191f01").unwrap().as_slice(),
             ExtendedPubKey::from_str("tpubD6NzVbkrYhZ4YUqaTmpewwbvSoA4dkwzGzvwGcUbwbRyu8i6dCSroCsvFmC6qzQgJxddMfA6Mg8r6XmkJVhQ8ihAWzfRBYTG5o28AC5HWX2").unwrap(),
             1567260002);
         let mut unlocker = Unlocker::new_for_master(&master, "whatever").unwrap();

src/lib.rs

@@ -23,8 +23,6 @@
 
 pub extern crate bitcoin;
 pub extern crate crypto;
-#[cfg(test)]
-extern crate hex;
 extern crate rand;
 extern crate serde;
 #[macro_use]

src/mnemonic.rs

@@ -167,8 +167,8 @@ mod test {
     use std::io::Read;
     use std::path::PathBuf;
 
+    use bitcoin::hashes::hex::FromHex;
     use bitcoin::network::constants::Network;
-    use hex::decode;
     use serde_json::Value;
 
     use context::SecpContext;
@@ -191,15 +191,15 @@ mod test {
 
         for t in 0..tests.len() {
             let values = tests[t].as_array().unwrap();
-            let data = decode(values[0].as_str().unwrap()).unwrap();
+            let data = Vec::<u8>::from_hex(values[0].as_str().unwrap()).unwrap();
             let m = values[1].as_str().unwrap();
             let mnemonic = Mnemonic::from_str(m).unwrap();
             let seed = mnemonic.to_seed(Some("TREZOR"));
             assert_eq!(
                 mnemonic.to_string(),
                 Mnemonic::new(data.as_slice()).unwrap().to_string()
             );
-            assert_eq!(seed.0, decode(values[2].as_str().unwrap()).unwrap());
+            assert_eq!(seed.0, Vec::<u8>::from_hex(values[2].as_str().unwrap()).unwrap());
 
             if values.len() == 4 {
                 let pk = values[3].as_str().unwrap();

src/proved.rs

@@ -678,6 +678,7 @@ mod test {
     use std::collections::HashSet;
     use std::str::FromStr;
 
+    use bitcoin::hashes::hex::ToHex;
     use bitcoin::network::constants::Network;
     use bitcoin::Address;
     use rand::{thread_rng, Rng};
@@ -822,13 +823,8 @@ mod test {
                     .iter()
                     .map(|v| Share::from_mnemonic(v.as_str().unwrap()).unwrap())
                     .collect::<Vec<_>>();
-                assert_eq!(
-                    result,
-                    hex::encode(
-                        ShamirSecretSharing::combine(&shares, Some("TREZOR"))
-                            .unwrap()
-                            .0
-                    )
+                assert_eq!(result,
+                    ShamirSecretSharing::combine(&shares, Some("TREZOR")).unwrap().0.to_hex(),
                 );
             }
         }