phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move LoadVerifyActivateChainstate to ChainTestingSetup

Browse source
This commit is contained in:
MarcoFalke 2023-05-05 13:12:30 +02:00
parent fa26e3462a
commit faae7d5c00
No known key found for this signature in database
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/test/util/setup_common.cpp
View file

@ -211,7 +211,7 @@ ChainTestingSetup::~ChainTestingSetup()
m_node.chainman.reset(); m_node.chainman.reset();
} }
void TestingSetup::LoadVerifyActivateChainstate() void ChainTestingSetup::LoadVerifyActivateChainstate()
{ {
auto& chainman{*Assert(m_node.chainman)}; auto& chainman{*Assert(m_node.chainman)};
node::ChainstateLoadOptions options; node::ChainstateLoadOptions options;
@ -241,10 +241,10 @@ TestingSetup::TestingSetup(
const std::vector<const char*>& extra_args, const std::vector<const char*>& extra_args,
const bool coins_db_in_memory, const bool coins_db_in_memory,
const bool block_tree_db_in_memory) const bool block_tree_db_in_memory)
: ChainTestingSetup(chainName, extra_args), : ChainTestingSetup(chainName, extra_args)
m_coins_db_in_memory(coins_db_in_memory),
m_block_tree_db_in_memory(block_tree_db_in_memory)
{ {
m_coins_db_in_memory = coins_db_in_memory;
m_block_tree_db_in_memory = block_tree_db_in_memory;
// Ideally we'd move all the RPC tests to the functional testing framework // Ideally we'd move all the RPC tests to the functional testing framework
// instead of unit tests, but for now we need these here. // instead of unit tests, but for now we need these here.
RegisterAllCoreRPCCommands(tableRPC); RegisterAllCoreRPCCommands(tableRPC);

10
src/test/util/setup_common.h
View file

@ -93,19 +93,19 @@ struct BasicTestingSetup {
*/ */
struct ChainTestingSetup : public BasicTestingSetup { struct ChainTestingSetup : public BasicTestingSetup {
node::CacheSizes m_cache_sizes{}; node::CacheSizes m_cache_sizes{};
bool m_coins_db_in_memory{true};
bool m_block_tree_db_in_memory{true};
explicit ChainTestingSetup(const std::string& chainName = CBaseChainParams::MAIN, const std::vector<const char*>& extra_args = {}); explicit ChainTestingSetup(const std::string& chainName = CBaseChainParams::MAIN, const std::vector<const char*>& extra_args = {});
~ChainTestingSetup(); ~ChainTestingSetup();
// Supplies a chainstate, if one is needed
void LoadVerifyActivateChainstate();
}; };
/** Testing setup that configures a complete environment. /** Testing setup that configures a complete environment.
*/ */
struct TestingSetup : public ChainTestingSetup { struct TestingSetup : public ChainTestingSetup {
bool m_coins_db_in_memory{true};
bool m_block_tree_db_in_memory{true};
void LoadVerifyActivateChainstate();
explicit TestingSetup( explicit TestingSetup(
const std::string& chainName = CBaseChainParams::MAIN, const std::string& chainName = CBaseChainParams::MAIN,
const std::vector<const char*>& extra_args = {}, const std::vector<const char*>& extra_args = {},