diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2018-05-12 11:48:41 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-05-29 14:20:12 -0700 |
| commit | 4defdfab94504018f822dc34a313ad26cedc8255 (patch) | |
| tree | 01ef5f955125b86070531fcb53c25791fdbde479 /src/consensus/merkle.h | |
| parent | 4437d6e1f3107a20a8c7b66be8b4b972a82e3b28 (diff) | |
| download | bitcoin-4defdfab94504018f822dc34a313ad26cedc8255.tar.xz | |
[MOVEONLY] Move unused Merkle branch code to tests
Diffstat (limited to 'src/consensus/merkle.h')
| -rw-r--r-- | src/consensus/merkle.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index f2559d458e..01d75b1329 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -12,9 +12,7 @@ #include <primitives/block.h> #include <uint256.h> -uint256 ComputeMerkleRoot(std::vector<uint256> hashes, bool* mutated); -std::vector<uint256> ComputeMerkleBranch(const std::vector<uint256>& leaves, uint32_t position); -uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vector<uint256>& branch, uint32_t position); +uint256 ComputeMerkleRoot(std::vector<uint256> hashes, bool* mutated = nullptr); /* * Compute the Merkle root of the transactions in a block. @@ -28,11 +26,4 @@ uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = nullptr); */ uint256 BlockWitnessMerkleRoot(const CBlock& block, bool* mutated = nullptr); -/* - * Compute the Merkle branch for the tree of transactions in a block, for a - * given position. - * This can be verified using ComputeMerkleRootFromBranch. - */ -std::vector<uint256> BlockMerkleBranch(const CBlock& block, uint32_t position); - #endif // BITCOIN_CONSENSUS_MERKLE_H |