diff --git a/src/util/address.rs b/src/util/address.rs index 917fa4d5..24174499 100644 --- a/src/util/address.rs +++ b/src/util/address.rs @@ -222,7 +222,7 @@ impl Address { #[inline] pub fn p2pkh(pk: &key::PublicKey, network: Network) -> Address { let mut hash_engine = PubkeyHash::engine(); - pk.write_into(&mut hash_engine); + pk.write_into(&mut hash_engine).expect("engines don't error"); Address { network: network, @@ -250,7 +250,7 @@ impl Address { } let mut hash_engine = WPubkeyHash::engine(); - pk.write_into(&mut hash_engine); + pk.write_into(&mut hash_engine).expect("engines don't error"); Ok(Address { network: network, @@ -271,7 +271,7 @@ impl Address { } let mut hash_engine = WPubkeyHash::engine(); - pk.write_into(&mut hash_engine); + pk.write_into(&mut hash_engine).expect("engines don't error"); let builder = script::Builder::new() .push_int(0) diff --git a/src/util/bip32.rs b/src/util/bip32.rs index 0b13c3d9..aec7c4a9 100644 --- a/src/util/bip32.rs +++ b/src/util/bip32.rs @@ -575,7 +575,7 @@ impl ExtendedPubKey { /// Returns the HASH160 of the public key of the xpub pub fn identifier(&self) -> XpubIdentifier { let mut engine = XpubIdentifier::engine(); - self.public_key.write_into(&mut engine); + self.public_key.write_into(&mut engine).expect("engines don't error"); XpubIdentifier::from_engine(engine) } diff --git a/src/util/key.rs b/src/util/key.rs index 2c4e6a35..d0cf0a21 100644 --- a/src/util/key.rs +++ b/src/util/key.rs @@ -101,18 +101,18 @@ impl PublicKey { } /// Write the public key into a writer - pub fn write_into(&self, mut writer: W) { - let _: io::Result<()> = if self.compressed { + pub fn write_into(&self, mut writer: W) -> Result<(), io::Error> { + if self.compressed { writer.write_all(&self.key.serialize()) } else { writer.write_all(&self.key.serialize_uncompressed()) - }; + } } /// Serialize the public key to bytes pub fn to_bytes(&self) -> Vec { let mut buf = Vec::new(); - self.write_into(&mut buf); + self.write_into(&mut buf).expect("vecs don't error"); buf } diff --git a/src/util/psbt/serialize.rs b/src/util/psbt/serialize.rs index 19167a21..d59e409d 100644 --- a/src/util/psbt/serialize.rs +++ b/src/util/psbt/serialize.rs @@ -58,7 +58,7 @@ impl Deserialize for Script { impl Serialize for PublicKey { fn serialize(&self) -> Vec { let mut buf = Vec::new(); - self.write_into(&mut buf); + self.write_into(&mut buf).expect("vecs don't error"); buf } }