From 50c0af7138bc90b621c6dd079de9c4c34d26c462 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 17 Feb 2025 12:37:13 +1100 Subject: [PATCH] Stop using Hash::from_slice This function is deprecated, stop using it in favour of `Hash::from_byte_array`. Patch only touches test code, I'm guessing that is why lint warnings were no showing up. --- bitcoin/src/blockdata/constants.rs | 2 +- bitcoin/src/p2p/message.rs | 2 +- hashes/src/hash160/mod.rs | 2 +- hashes/src/sha256d/mod.rs | 2 +- hashes/src/siphash24/mod.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitcoin/src/blockdata/constants.rs b/bitcoin/src/blockdata/constants.rs index ad8e96fdf..4b7e51486 100644 --- a/bitcoin/src/blockdata/constants.rs +++ b/bitcoin/src/blockdata/constants.rs @@ -373,7 +373,7 @@ mod test { // The genesis block hash is a double-sha256 and it is displayed backwards. let genesis_hash = genesis_block(network).block_hash(); // We abuse the sha256 hash here so we get a LowerHex impl that does not print the hex backwards. - let hash = sha256::Hash::from_slice(genesis_hash.as_byte_array()).unwrap(); + let hash = sha256::Hash::from_byte_array(genesis_hash.to_byte_array()); let want = format!("{:02x}", hash); let chain_hash = ChainHash::using_genesis_block_const(network); diff --git a/bitcoin/src/p2p/message.rs b/bitcoin/src/p2p/message.rs index e29380105..fda7cdd47 100644 --- a/bitcoin/src/p2p/message.rs +++ b/bitcoin/src/p2p/message.rs @@ -716,7 +716,7 @@ mod test { use crate::script::ScriptBuf; use crate::transaction::Transaction; - fn hash(slice: [u8; 32]) -> sha256d::Hash { sha256d::Hash::from_slice(&slice).unwrap() } + fn hash(array: [u8; 32]) -> sha256d::Hash { sha256d::Hash::from_byte_array(array) } #[test] fn full_round_ser_der_raw_network_message() { diff --git a/hashes/src/hash160/mod.rs b/hashes/src/hash160/mod.rs index d70ec275d..282d653d7 100644 --- a/hashes/src/hash160/mod.rs +++ b/hashes/src/hash160/mod.rs @@ -118,7 +118,7 @@ mod tests { 0xf1, 0x4a, 0xca, 0xd7, ]; - let hash = hash160::Hash::from_slice(&HASH_BYTES).expect("right number of bytes"); + let hash = hash160::Hash::from_byte_array(HASH_BYTES); assert_tokens(&hash.compact(), &[Token::BorrowedBytes(&HASH_BYTES[..])]); assert_tokens(&hash.readable(), &[Token::Str("132072df690933835eb8b6ad0b77e7b6f14acad7")]); } diff --git a/hashes/src/sha256d/mod.rs b/hashes/src/sha256d/mod.rs index 54943db51..adb2ffa71 100644 --- a/hashes/src/sha256d/mod.rs +++ b/hashes/src/sha256d/mod.rs @@ -122,7 +122,7 @@ mod tests { 0xb7, 0x65, 0x44, 0x8c, 0x86, 0x35, 0xfb, 0x6c, ]; - let hash = sha256d::Hash::from_slice(&HASH_BYTES).expect("right number of bytes"); + let hash = sha256d::Hash::from_byte_array(HASH_BYTES); assert_tokens(&hash.compact(), &[Token::BorrowedBytes(&HASH_BYTES[..])]); assert_tokens( &hash.readable(), diff --git a/hashes/src/siphash24/mod.rs b/hashes/src/siphash24/mod.rs index a46fefe01..1db747733 100644 --- a/hashes/src/siphash24/mod.rs +++ b/hashes/src/siphash24/mod.rs @@ -321,7 +321,7 @@ mod tests { for i in 0..64 { vin[i] = i as u8; - let vec = Hash::from_slice(&vecs[i]).unwrap(); + let vec = Hash::from_byte_array(vecs[i]); let out = Hash::hash_with_keys(k0, k1, &vin[0..i]); assert_eq!(vec, out, "vec #{}", i);