Skip to content

Commit 4a4289e

Browse files
committed
Merge bitcoin/bitcoin#25772: test: Add missing static to IsStandardTx helper
fad5bc4 test: Add missing static to IsStandardTx helper (MacroFake) Pull request description: Requested in bitcoin/bitcoin#25648 (comment) Also remove line break from the other two helpers. ACKs for top commit: glozow: utACK fad5bc4 aureleoules: ACK fad5bc4. theStack: ACK fad5bc4 Tree-SHA512: 771411e1fb5939a58491ecf719e1929ab0150b0faae2078ac72bd13117f1d4dcffdeed5027bfae53e4336af25a4f1db47d564abc06a5a2c9ec006a9f67bae104
2 parents 9155f9b + fad5bc4 commit 4a4289e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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)