GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108)

Browse source
This commit is contained in:
James Dorfman 2024-08-13 04:14:39 +00:00
commit 31df518140
40 changed files with 59 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/script_tests.cpp
View file

@ -263,11 +263,11 @@ private:
CScriptWitness scriptWitness;
CTransactionRef creditTx;
CMutableTransaction spendTx;
bool havePush;
bool havePush{false};
std::vector<unsigned char> push;
std::string comment;
uint32_t flags;
int scriptError;
int scriptError{SCRIPT_ERR_OK};
CAmount nValue;
void DoPush()
@ -286,7 +286,7 @@ private:
}
public:
TestBuilder(const CScript& script_, const std::string& comment_, uint32_t flags_, bool P2SH = false, WitnessMode wm = WitnessMode::NONE, int witnessversion = 0, CAmount nValue_ = 0) : script(script_), havePush(false), comment(comment_), flags(flags_), scriptError(SCRIPT_ERR_OK), nValue(nValue_)
TestBuilder(const CScript& script_, const std::string& comment_, uint32_t flags_, bool P2SH = false, WitnessMode wm = WitnessMode::NONE, int witnessversion = 0, CAmount nValue_ = 0) : script(script_), comment(comment_), flags(flags_), nValue(nValue_)
{
CScript scriptPubKey = script;
if (wm == WitnessMode::PKH) {