Adopting new ECDSA key constructors throughout the library

src/util/address.rs

@@ -27,10 +27,7 @@
 //!
 //! // Generate random key pair
 //! let s = Secp256k1::new();
-//! let public_key = ecdsa::PublicKey {
+//! let public_key = ecdsa::PublicKey::new(s.generate_keypair(&mut thread_rng()).1);
-//!     compressed: true,
-//!     key: s.generate_keypair(&mut thread_rng()).1,
-//! };
 //!
 //! // Generate pay-to-pubkey-hash address
 //! let address = Address::p2pkh(&public_key, Network::Bitcoin);

src/util/bip32.rs

@@ -497,18 +497,14 @@ impl ExtendedPrivKey {
         hmac_engine.input(seed);
         let hmac_result: Hmac<sha512::Hash> = Hmac::from_engine(hmac_engine);
 
+        let sk = secp256k1::SecretKey::from_slice(&hmac_result[..32])?;
+
         Ok(ExtendedPrivKey {
             network: network,
             depth: 0,
             parent_fingerprint: Default::default(),
             child_number: ChildNumber::from_normal_idx(0)?,
-            private_key: PrivateKey {
+            private_key: PrivateKey::new(sk, network),
-                compressed: true,
-                network: network,
-                key: secp256k1::SecretKey::from_slice(
-                    &hmac_result[..32]
-                ).map_err(Error::Ecdsa)?,
-            },
             chain_code: ChainCode::from(&hmac_result[32..]),
         })
     }
@@ -545,11 +541,10 @@ impl ExtendedPrivKey {
 
         hmac_engine.input(&endian::u32_to_array_be(u32::from(i)));
         let hmac_result: Hmac<sha512::Hash> = Hmac::from_engine(hmac_engine);
-        let mut sk = PrivateKey {
+        let mut sk = PrivateKey::new(
-            compressed: true,
+            secp256k1::SecretKey::from_slice(&hmac_result[..32])?,
-            network: self.network,
+            self.network
-            key: secp256k1::SecretKey::from_slice(&hmac_result[..32]).map_err(Error::Ecdsa)?,
+        );
-        };
         sk.key.add_assign(&self.private_key[..]).map_err(Error::Ecdsa)?;
 
         Ok(ExtendedPrivKey {
@@ -578,19 +573,18 @@ impl ExtendedPrivKey {
             return Err(Error::UnknownVersion(ver));
         };
 
+        let sk = PrivateKey::new(
+            secp256k1::SecretKey::from_slice(&data[46..78])?,
+            network
+        );
+
         Ok(ExtendedPrivKey {
             network: network,
             depth: data[4],
             parent_fingerprint: Fingerprint::from(&data[5..9]),
             child_number: endian::slice_to_u32_be(&data[9..13]).into(),
             chain_code: ChainCode::from(&data[13..45]),
-            private_key: PrivateKey {
+            private_key: sk,
-                compressed: true,
-                network: network,
-                key: secp256k1::SecretKey::from_slice(
-                    &data[46..78]
-                ).map_err(Error::Ecdsa)?,
-            },
         })
     }
 
@@ -662,11 +656,10 @@ impl ExtendedPubKey {
 
                 let hmac_result: Hmac<sha512::Hash> = Hmac::from_engine(hmac_engine);
 
-                let private_key = PrivateKey {
+                let private_key = PrivateKey::new(
-                    compressed: true,
+                    secp256k1::SecretKey::from_slice(&hmac_result[..32])?,
-                    network: self.network,
+                    self.network,
-                    key: secp256k1::SecretKey::from_slice(&hmac_result[..32])?,
+                );
-                };
                 let chain_code = ChainCode::from(&hmac_result[32..]);
                 Ok((private_key, chain_code))
             }

src/util/contracthash.rs

@@ -329,25 +329,13 @@ mod tests {
         let (sk2, pk2) = secp.generate_keypair(&mut thread_rng());
         let (sk3, pk3) = secp.generate_keypair(&mut thread_rng());
 
-        let sk1 = PrivateKey {
+        let sk1 = PrivateKey::new(sk1, Network::Bitcoin);
-            key: sk1,
+        let sk2 = PrivateKey::new_uncompressed(sk2, Network::Bitcoin);
-            compressed: true,
+        let sk3 = PrivateKey::new(sk3, Network::Bitcoin);
-            network: Network::Bitcoin,
-        };
-        let sk2 = PrivateKey {
-            key: sk2,
-            compressed: false,
-            network: Network::Bitcoin,
-        };
-        let sk3 = PrivateKey {
-            key: sk3,
-            compressed: true,
-            network: Network::Bitcoin,
-        };
         let pks = [
-            PublicKey { key: pk1, compressed: true },
+            PublicKey::new(pk1),
-            PublicKey { key: pk2, compressed: false },
+            PublicKey::new_uncompressed(pk2),
-            PublicKey { key: pk3, compressed: true },
+            PublicKey::new(pk3),
         ];
         let contract = b"if bottle mt dont remembr drink wont pay";