Skip to content

Commit 80fdb6f

Browse files
author
MarcoFalke
committed
Merge #17442: fix Typo: "merkelRoot" -> "merkleRoot"
eb880f0 fix Typo: "merkelRoot" -> "merkleRoot" (ianliu) Pull request description: <!-- *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. --> <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. --> <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. --> ACKs for top commit: practicalswift: ACK eb880f0 but please change from `merkleRootofHashes` to `merkleRootOfHashes` Tree-SHA512: ada9edceee19da5678bf35e1258163e7102fe176dc5cf40acaa1468fa8b2801494f8bf65d5359dcd0054fbc22f07fdc98d6208cfdb54dd9171fd45c89d71e098
2 parents a6f6333 + eb880f0 commit 80fdb6f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/test/merkle_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ BOOST_AUTO_TEST_CASE(merkle_test_BlockWitness)
345345
hashes[0].SetNull();
346346
hashes[1] = block.vtx[1]->GetHash();
347347

348-
uint256 merkelRootofHashes = ComputeMerkleRoot(hashes);
348+
uint256 merkleRootofHashes = ComputeMerkleRoot(hashes);
349349

350-
BOOST_CHECK_EQUAL(merkelRootofHashes, blockWitness);
350+
BOOST_CHECK_EQUAL(merkleRootofHashes, blockWitness);
351351
}
352352
BOOST_AUTO_TEST_SUITE_END()

0 commit comments

Comments
 (0)