phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-27 03:33:27 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bitcoin/bitcoin#25772: test: Add missing static to IsStandardTx helper

Browse source 
fad5bc432b 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 fad5bc432b
  aureleoules:
    ACK fad5bc432b.
  theStack:
    ACK fad5bc432b

Tree-SHA512: 771411e1fb5939a58491ecf719e1929ab0150b0faae2078ac72bd13117f1d4dcffdeed5027bfae53e4336af25a4f1db47d564abc06a5a2c9ec006a9f67bae104
This commit is contained in:
fanquake 2022-08-03 12:22:50 +01:00
commit 4a4289e2c9
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 3 additions and 5 deletions
Show stats 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> #include <boost/test/unit_test.hpp>
// Helpers: // 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); return IsStandardTx(tx, std::nullopt, DEFAULT_PERMIT_BAREMULTISIG, CFeeRate{DUST_RELAY_TX_FEE}, reason);
} }
static std::vector<unsigned char> static std::vector<unsigned char> Serialize(const CScript& s)
Serialize(const CScript& s)
{ {
std::vector<unsigned char> sSerialized(s.begin(), s.end()); std::vector<unsigned char> sSerialized(s.begin(), s.end());
return sSerialized; return sSerialized;
} }
static bool static bool Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
Verify(const CScript& scriptSig, const CScript& scriptPubKey, bool fStrict, ScriptError& err)
{ {
// Create dummy to/from transactions: // Create dummy to/from transactions:
CMutableTransaction txFrom; CMutableTransaction txFrom;