diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-28 22:24:10 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-28 22:27:38 +0100 |
| commit | 61457c29d735b77182b5fbd45e86d7e3db343857 (patch) | |
| tree | 12ef26e009f3bab19c7b4d9f8e643db2ccd8a5f0 /src/primitives/block.h | |
| parent | 8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe (diff) | |
| parent | eece63fa72566068cb2a1bf85c95a72a5ba59bc9 (diff) | |
Merge pull request #6508
eece63f Switch blocks to a constant-space Merkle root/branch algorithm. (Pieter Wuille)
ee60e56 Add merkle.{h,cpp}, generic merkle root/branch algorithm (Pieter Wuille)
Diffstat (limited to 'src/primitives/block.h')
| -rw-r--r-- | src/primitives/block.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/primitives/block.h b/src/primitives/block.h index 54731ff557..5c017d436f 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -118,12 +118,6 @@ public: return block; } - // Build the merkle tree for this block and return the merkle root. - // If non-NULL, *mutated is set to whether mutation was detected in the merkle - // tree (a duplication of transactions in the block leading to an identical - // merkle root). - uint256 ComputeMerkleRoot(bool* mutated = NULL) const; - std::string ToString() const; }; |