milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Change encode path 

Change the path for `consensus::encode` to use one level of path instead of importing the function name
This commit is contained in:
Jamil Lambert, PhD 2024-06-13 15:54:22 +01:00
parent efdcadf2fd
commit c4c1252a9e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitcoin/src/merkle_tree/block.rs
View File

@ -519,7 +519,7 @@ mod tests {
use secp256k1::rand::prelude::*; use secp256k1::rand::prelude::*;
use super::*; use super::*;
use crate::consensus::encode::{deserialize, serialize}; use crate::consensus::encode;
use crate::hash_types::Txid; use crate::hash_types::Txid;
use crate::hex::FromHex; use crate::hex::FromHex;
@ -598,7 +598,7 @@ mod tests {
// Build the partial merkle tree // Build the partial merkle tree
let pmt1 = PartialMerkleTree::from_txids(&tx_ids, &matches); let pmt1 = PartialMerkleTree::from_txids(&tx_ids, &matches);
let serialized = serialize(&pmt1); let serialized = encode::serialize(&pmt1);
// Verify PartialMerkleTree's size guarantees // Verify PartialMerkleTree's size guarantees
let n = min(tx_count, 1 + match_txid1.len() * height); let n = min(tx_count, 1 + match_txid1.len() * height);
@ -606,7 +606,7 @@ mod tests {
// Deserialize into a tester copy // Deserialize into a tester copy
let pmt2: PartialMerkleTree = let pmt2: PartialMerkleTree =
deserialize(&serialized).expect("Could not deserialize own data"); encode::deserialize(&serialized).expect("Could not deserialize own data");
// Extract merkle root and matched txids from copy // Extract merkle root and matched txids from copy
let mut match_txid2: Vec<Txid> = vec![]; let mut match_txid2: Vec<Txid> = vec![];
@ -624,7 +624,7 @@ mod tests {
// check that random bit flips break the authentication // check that random bit flips break the authentication
for _ in 0..4 { for _ in 0..4 {
let mut pmt3: PartialMerkleTree = deserialize(&serialized).unwrap(); let mut pmt3: PartialMerkleTree = encode::deserialize(&serialized).unwrap();
pmt3.damage(&mut rng); pmt3.damage(&mut rng);
let mut match_txid3 = vec![]; let mut match_txid3 = vec![];
let merkle_root_3 = pmt3.extract_matches(&mut match_txid3, &mut indexes).unwrap(); let merkle_root_3 = pmt3.extract_matches(&mut match_txid3, &mut indexes).unwrap();
@ -656,14 +656,14 @@ mod tests {
// `gettxoutproof '["220ebc64e21abece964927322cba69180ed853bb187fbc6923bac7d010b9d87a"]'` // `gettxoutproof '["220ebc64e21abece964927322cba69180ed853bb187fbc6923bac7d010b9d87a"]'`
let mb_hex = include_str!("../../tests/data/merkle_block.hex"); let mb_hex = include_str!("../../tests/data/merkle_block.hex");
let mb: MerkleBlock = deserialize(&hex!(mb_hex)).unwrap(); let mb: MerkleBlock = encode::deserialize(&hex!(mb_hex)).unwrap();
assert_eq!(get_block_13b8a().block_hash(), mb.header.block_hash()); assert_eq!(get_block_13b8a().block_hash(), mb.header.block_hash());
assert_eq!( assert_eq!(
mb.header.merkle_root, mb.header.merkle_root,
mb.txn.extract_matches(&mut vec![], &mut vec![]).unwrap() mb.txn.extract_matches(&mut vec![], &mut vec![]).unwrap()
); );
// Serialize again and check that it matches the original bytes // Serialize again and check that it matches the original bytes
assert_eq!(mb_hex, serialize(&mb).to_lower_hex_string().as_str()); assert_eq!(mb_hex, encode::serialize(&mb).to_lower_hex_string().as_str());
} }
/// Create a CMerkleBlock using a list of txids which will be found in the /// Create a CMerkleBlock using a list of txids which will be found in the
@ -747,7 +747,7 @@ mod tests {
fn get_block_13b8a() -> Block { fn get_block_13b8a() -> Block {
use hex::FromHex; use hex::FromHex;
let block_hex = include_str!("../../tests/data/block_13b8a.hex"); let block_hex = include_str!("../../tests/data/block_13b8a.hex");
deserialize(&Vec::from_hex(block_hex).unwrap()).unwrap() encode::deserialize(&Vec::from_hex(block_hex).unwrap()).unwrap()
} }
macro_rules! check_calc_tree_width { macro_rules! check_calc_tree_width {