Skip to content

Commit c521a98

Browse files
committed
merge bitcoin#25772: Add missing static to IsStandardTx helper
1 parent 5996724 commit c521a98

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/test/evo_assetlocks_tests.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
#include <boost/test/unit_test.hpp>
2020

2121
// Helpers:
22-
bool IsStandardTx(const CTransaction& tx, std::string& reason)
22+
static bool IsStandardTx(const CTransaction& tx, std::string& reason)
2323
{
2424
return IsStandardTx(tx, MAX_OP_RETURN_RELAY, DEFAULT_PERMIT_BAREMULTISIG, CFeeRate{DUST_RELAY_TX_FEE}, reason);
2525
}
2626

2727
// Create two dummy transactions, each with two outputs. The first has 11 and 50 CENT outputs
2828
// paid to a TX_PUBKEY, the second 21 and 22 CENT outputs paid to a TX_PUBKEYHASH.
29-
static std::vector<CMutableTransaction>
30-
SetupDummyInputs(FillableSigningProvider& keystoreRet, CCoinsViewCache& coinsRet)
29+
static std::vector<CMutableTransaction> SetupDummyInputs(FillableSigningProvider& keystoreRet, CCoinsViewCache& coinsRet)
3130
{
3231
std::vector<CMutableTransaction> dummyTransactions;
3332
dummyTransactions.resize(2);

src/test/script_p2sh_tests.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,18 @@
1818
#include <boost/test/unit_test.hpp>
1919

2020
// Helpers:
21-
bool IsStandardTx(const CTransaction& tx, std::string& reason)
21+
static bool IsStandardTx(const CTransaction& tx, std::string& reason)
2222
{
2323
return IsStandardTx(tx, std::nullopt, DEFAULT_PERMIT_BAREMULTISIG, CFeeRate{DUST_RELAY_TX_FEE}, reason);
2424
}
2525

26-
static std::vector<unsigned char>
27-
Serialize(const CScript& s)
26+
static std::vector<unsigned char> Serialize(const CScript& s)
2827
{
2928
std::vector<unsigned char> sSerialized(s.begin(), s.end());
3029
return sSerialized;
3130
}
3231

33-
static bool
34-
Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
32+
static bool Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
3533
{
3634
// Create dummy to/from transactions:
3735
CMutableTransaction txFrom;

0 commit comments

Comments
 (0)