mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-02 17:24:58 +02:00
Merge bitcoin/bitcoin#25472: build: Increase MS Visual Studio minimum version
630c1711b4refactor: Drop no longer needed `util/designator.h` (Hennadii Stepanov)88ec5d40dcbuild: Increase MS Visual Studio minimum version (Hennadii Stepanov)555f9dd5d3rpc, refactor: Add `decodepsbt_outputs` (Hennadii Stepanov)0c432cbbfarpc, refactor: Add `decodepsbt_inputs` (Hennadii Stepanov)01d95a3964rpc, refactor: Add `getblock_prevout` (Hennadii Stepanov) Pull request description: Visual Studio 2022 with `/std:c++20` supports [designated initializers](https://github.com/bitcoin/bitcoin/pull/24531). ACKs for top commit: sipsorcery: reACK630c1711b4. Tree-SHA512: 5b8933940dd69061c6b077512168bebb6fea05d429b63ffbab191950798b4c825e8484b1a651db0ae13f97eae481097d3c16395659c0f3b9f847af2aaf44b65d
This commit is contained in:
@@ -36,7 +36,6 @@
|
||||
#include <timedata.h>
|
||||
#include <txdb.h>
|
||||
#include <txmempool.h>
|
||||
#include <util/designator.h>
|
||||
#include <util/strencodings.h>
|
||||
#include <util/string.h>
|
||||
#include <util/thread.h>
|
||||
@@ -158,10 +157,10 @@ BasicTestingSetup::~BasicTestingSetup()
|
||||
CTxMemPool::Options MemPoolOptionsForTest(const NodeContext& node)
|
||||
{
|
||||
CTxMemPool::Options mempool_opts{
|
||||
Desig(estimator) node.fee_estimator.get(),
|
||||
.estimator = node.fee_estimator.get(),
|
||||
// Default to always checking mempool regardless of
|
||||
// chainparams.DefaultConsistencyChecks for tests
|
||||
Desig(check_ratio) 1,
|
||||
.check_ratio = 1,
|
||||
};
|
||||
ApplyArgsManOptions(*node.args, mempool_opts);
|
||||
return mempool_opts;
|
||||
|
||||
Reference in New Issue
Block a user