GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 17acbc1a5a into merged_master (Bitcoin PR bitcoin/bitcoin#25974)

Browse source
This commit is contained in:
Byron Hambly 2025-04-05 10:03:26 +02:00
commit cfdedd8e98
8 changed files with 38 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/transaction_tests.cpp
View file

@ -21,6 +21,7 @@
#include <script/signingprovider.h>
#include <script/standard.h>
#include <streams.h>
#include <test/util/json.h>
#include <test/util/script.h>
#include <test/util/transaction_utils.h>
#include <util/strencodings.h>
@ -37,9 +38,6 @@
typedef std::vector<unsigned char> valtype;
// In script_tests.cpp
UniValue read_json(const std::string& jsondata);
static CFeeRate g_dust{DUST_RELAY_TX_FEE};
static bool g_bare_multi{DEFAULT_PERMIT_BAREMULTISIG};