Andrew Poelstra 70eb92cc87 Merge rust-bitcoin/rust-bitcoin#1374: Move `merkleblock` into `merkle_tree` ... 613107298d Move merkleblock into merkle_tree (Tobin C. Harding) c89d9c48ac Move merkle_tree.rs to merkle_tree/mod.rs (Tobin C. Harding) Pull request description: Re-done after review comments below. This is now PR 1 in the `merkle_tree::block` series :) Move the `merkleblock` module into the `merkle_tree` module in a submodule called `block`. In order to do the minimum amount of changes in this patch DO NOT rename types to improved naming and reduce stutter. Note: - block module is private - the three types are re-exported from `merkle_block` - the `MerkleBlock` re-export from the crate root is left in place. This patch purposefully does the minimum amount of changes because there a whole bunch of improvements to the old "merkleblock" module that are coming next in a separate PR. ACKs for top commit: Kixunil: ACK 613107298d apoelstra: ACK 613107298d Tree-SHA512: 7299f605a0408372301642ac6826f7532de187b43a6d934715fc0806379b04cfd1550610428b720cb89095659c25e0f4fc8d6c842a93eafc19c091bbfcd5f35e		2022-11-15 17:11:34 +00:00
..
contrib	Merge rust-bitcoin/rust-bitcoin#999: examples: Add taproot PSBT example workflow	2022-10-25 16:47:18 +00:00
examples	Remove deprecated re-exports	2022-11-08 11:55:35 +11:00
src	Merge rust-bitcoin/rust-bitcoin#1374: Move `merkleblock` into `merkle_tree`	2022-11-15 17:11:34 +00:00
tests	Add a test parsing transaction with a huge witness	2022-11-01 14:27:38 +01:00
Cargo.toml	Merge rust-bitcoin/rust-bitcoin#1344: Fix `no_std` when `bitcoinconsensus` is enabled	2022-11-05 13:42:50 +00:00