diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-01-04 12:30:36 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-01-04 12:31:07 +0100 |
| commit | f7e182a973ed66b4c11dc6239e57016655503b4c (patch) | |
| tree | d27513c6ef274e058105c7215b4c819b9502ac15 /src/test | |
| parent | 5b6b371c777a6d6a06d50e43ac9cabfea1f64dfa (diff) | |
| parent | b9f226b41f989f5c07fe57801701a39c14a6e173 (diff) | |
| download | bitcoin-f7e182a973ed66b4c11dc6239e57016655503b4c.tar.xz | |
Merge #12151: rpc: Remove cs_main lock from blockToJSON and blockheaderToJSON
b9f226b41f rpc: Remove cs_main lock from blockToJSON and blockHeaderToJSON (João Barbosa)
343b98cbcd rpc: Specify chain tip instead of chain in GetDifficulty (João Barbosa)
54dc13b6a2 rpc: Fix SoftForkMajorityDesc and SoftForkDesc signatures (João Barbosa)
Pull request description:
Motivated by https://github.com/bitcoin/bitcoin/pull/11913#discussion_r157798157, this pull makes `blockToJSON` and `blockheaderToJSON` free of `cs_main` locks.
Locking `cs_main` was required to access `chainActive` in order to check if the block was in the chain and to retrieve the next block index.
With the this approach, `CBlockIndex::GetAncestor()` is used in a way to check if the block belongs to the specified chain tip and, at the same time, get the next block index.
Tree-SHA512: a6720ace0182c19033bbed1a404f729d793574db8ab16e0966ffe412145611e32c30aaab02975d225df6d439d7b9ef2070e732b16137a902b0293c8cddfeb85f
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/blockchain_tests.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp index 7d8ae46fb8..b61152985f 100644 --- a/src/test/blockchain_tests.cpp +++ b/src/test/blockchain_tests.cpp @@ -68,11 +68,4 @@ BOOST_AUTO_TEST_CASE(get_difficulty_for_very_high_target) TestDifficulty(0x12345678, 5913134931067755359633408.0); } -// Verify that difficulty is 1.0 for an empty chain. -BOOST_AUTO_TEST_CASE(get_difficulty_for_null_tip) -{ - double difficulty = GetDifficulty(nullptr); - RejectDifficultyMismatch(difficulty, 1.0); -} - BOOST_AUTO_TEST_SUITE_END() |