phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-25 10:43:19 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #18181: test: Remove incorrect assumptions in validation_flush_tests

Browse source 
faca8eff39 test: Remove incorrect assumptions in validation_flush_tests (MarcoFalke)
fa31eebfe9 test: Tabs to spaces in all tests (MarcoFalke)

Pull request description:

  The tests assume standard library internals that may not hold on all supported archs or when the code is instrumented for sanitizer or debug use cases

  Fixes #18111

ACKs for top commit:
  jamesob:
    ACK faca8eff39 pending passing tests
  fjahr:
    ACK faca8eff39

Tree-SHA512: 60a5ae824bdffb0762f82f67957b31b185385900be5e676fcb12c23d53f5eea734601680c2e3f0bdb8052ce90e7ca1911b1342affb67e43d91a506b111406f41
This commit is contained in:
MarcoFalke 2020-02-22 22:18:37 +07:00
commit ab9de43588
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
3 changed files with 25 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/test/transaction_tests.cpp
View file

@ -124,8 +124,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
bool fValid = true;
for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
const UniValue& input = inputs[inpIdx];
if (!input.isArray())
{
if (!input.isArray()) {
fValid = false;
break;
}
@ -211,8 +210,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
bool fValid = true;
for (unsigned int inpIdx = 0; inpIdx < inputs.size(); inpIdx++) {
const UniValue& input = inputs[inpIdx];
if (!input.isArray())
{
if (!input.isArray()) {
fValid = false;
break;
}

26
src/test/validation_flush_tests.cpp
View file

@ -2,10 +2,10 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
//
#include <txmempool.h>
#include <validation.h>
#include <sync.h>
#include <test/util/setup_common.h>
#include <txmempool.h>
#include <validation.h>
#include <boost/test/unit_test.hpp>
@ -85,12 +85,7 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
// This is contingent not only on the dynamic memory usage of the Coins
// that we're adding (COIN_SIZE bytes per), but also on how much memory the
// cacheCoins (unordered_map) preallocates.
//
// I came up with the count by examining the printed memory usage of the
// CCoinsCacheView, so it's sort of arbitrary - but it shouldn't change
// unless we somehow change the way the cacheCoins map allocates memory.
//
constexpr int COINS_UNTIL_CRITICAL = is_64_bit ? 4 : 5;
constexpr int COINS_UNTIL_CRITICAL{3};
for (int i{0}; i < COINS_UNTIL_CRITICAL; ++i) {
COutPoint res = add_coin(view);
@ -101,17 +96,14 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate)
CoinsCacheSizeState::OK);
}
// Adding an additional coin will push us over the edge to CRITICAL.
add_coin(view);
print_view_mem_usage(view);
auto size_state = chainstate.GetCoinsCacheSizeState(
tx_pool, MAX_COINS_CACHE_BYTES, /*max_mempool_size_bytes*/ 0);
if (!is_64_bit && size_state == CoinsCacheSizeState::LARGE) {
// On 32 bit hosts, we may hit LARGE before CRITICAL.
// Adding some additional coins will push us over the edge to CRITICAL.
for (int i{0}; i < 4; ++i) {
add_coin(view);
print_view_mem_usage(view);
if (chainstate.GetCoinsCacheSizeState(tx_pool, MAX_COINS_CACHE_BYTES, /*max_mempool_size_bytes*/ 0) ==
CoinsCacheSizeState::CRITICAL) {
break;
}
}
BOOST_CHECK_EQUAL(