diff options
author | fanquake <fanquake@gmail.com> | 2022-08-03 12:22:50 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2022-08-03 12:33:01 +0100 |
commit | 4a4289e2c98cfbc51b05716f21065838afed80f6 (patch) | |
tree | f31cec67fde25605f30960cb4acb540bde15fa24 /src/test/script_p2sh_tests.cpp | |
parent | 9155f9b7af22a9c97cbeee461f5bbd9217adb56d (diff) | |
parent | fad5bc432b4e96aaf14bb1e02c1f6f3355a31441 (diff) | |
download | bitcoin-4a4289e2c98cfbc51b05716f21065838afed80f6.tar.xz |
Merge bitcoin/bitcoin#25772: test: Add missing static to IsStandardTx helper
fad5bc432b4e96aaf14bb1e02c1f6f3355a31441 test: Add missing static to IsStandardTx helper (MacroFake)
Pull request description:
Requested in https://github.com/bitcoin/bitcoin/pull/25648#discussion_r935985961
Also remove line break from the other two helpers.
ACKs for top commit:
glozow:
utACK fad5bc432b4e96aaf14bb1e02c1f6f3355a31441
aureleoules:
ACK fad5bc432b4e96aaf14bb1e02c1f6f3355a31441.
theStack:
ACK fad5bc432b4e96aaf14bb1e02c1f6f3355a31441
Tree-SHA512: 771411e1fb5939a58491ecf719e1929ab0150b0faae2078ac72bd13117f1d4dcffdeed5027bfae53e4336af25a4f1db47d564abc06a5a2c9ec006a9f67bae104
Diffstat (limited to 'src/test/script_p2sh_tests.cpp')
-rw-r--r-- | src/test/script_p2sh_tests.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/test/script_p2sh_tests.cpp b/src/test/script_p2sh_tests.cpp index 6e810faa0a..a02d51eecc 100644 --- a/src/test/script_p2sh_tests.cpp +++ b/src/test/script_p2sh_tests.cpp @@ -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; |