GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge a5e756b74e into merged_master (Bitcoin PR #21676)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-30 17:06:01 +00:00
commit a20f127ddd
6 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,6 +145,7 @@ BasicTestingSetup::BasicTestingSetup(const std::string& chainName, const std::st
BasicTestingSetup::~BasicTestingSetup()
{
ClearGlobalAssetDir();
SetMockTime(0s); // Reset mocktime for following tests
LogInstance().DisconnectTestLogger();
fs::remove_all(m_path_root);
gArgs.ClearArgs();
@ -328,7 +329,6 @@ CMutableTransaction TestChain100Setup::CreateValidMempoolTransaction(CTransactio
TestChain100Setup::~TestChain100Setup()
{
gArgs.ForceSetArg("-segwitheight", "0");
SetMockTime(0);
}
CTxMemPoolEntry TestMemPoolEntryHelper::FromTx(const CMutableTransaction& tx) const