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 4a4289e2c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25772)

Browse source
This commit is contained in:
Byron Hambly 2024-10-25 10:04:49 +02:00
commit 9fb06e251c
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/script_p2sh_tests.cpp
View file

@ -18,20 +18,18 @@
#include <boost/test/unit_test.hpp>
// Helpers:
bool IsStandardTx(const CTransaction& tx, std::string& reason)
static bool IsStandardTx(const CTransaction& tx, std::string& reason)
{
return IsStandardTx(tx, std::nullopt, DEFAULT_PERMIT_BAREMULTISIG, CFeeRate{DUST_RELAY_TX_FEE}, reason);
}
static std::vector<unsigned char>
Serialize(const CScript& s)
static std::vector<unsigned char> Serialize(const CScript& s)
{
std::vector<unsigned char> sSerialized(s.begin(), s.end());
return sSerialized;
}
static bool
Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
static bool Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
{
// Create dummy to/from transactions:
CMutableTransaction txFrom;