Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: Update script_p2sh_tests from upstream #2357

Merged
merged 4 commits into from
Oct 8, 2021
Merged

test: Update script_p2sh_tests from upstream #2357

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f6239d
Add copyright header, clean up includes. Remove namespace declaration
barton2526 Sep 28, 2021
38d1da3
Test for expected return values when calling functions returning a su…
barton2526 Oct 8, 2021
4aece52
tests: Use std::vector API for construction of test data
barton2526 Oct 8, 2021
9acda2c
test: fix script_p2sh_tests OP_PUSHBACK2/4 missing
barton2526 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 36 additions & 27 deletions src/test/script_p2sh_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include <boost/assert.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/assign/list_inserter.hpp>
#include <boost/assign/std/vector.hpp>
#include <boost/test/unit_test.hpp>
// Copyright (c) 2012-2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include <main.h>
#include <policy/policy.h>
#include <script.h>
#include <validation.h>
#include <wallet/wallet.h>

#include "main.h"
#include "policy/policy.h"
#include "script.h"
#include "validation.h"
#include "wallet/wallet.h"
#include <vector>

using namespace std;
#include <boost/test/unit_test.hpp>

// Test routines internal to script.cpp:
extern uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType);
Expand Down Expand Up @@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(sign)
for (int i = 0; i < 4; i++)
{
key[i].MakeNewKey(true);
keystore.AddKey(key[i]);
BOOST_CHECK(keystore.AddKey(key[i]));
}

// 8 Scripts: checking all combinations of
Expand All @@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(sign)
CScript evalScripts[4];
for (int i = 0; i < 4; i++)
{
keystore.AddCScript(standardScripts[i]);
BOOST_CHECK(keystore.AddCScript(standardScripts[i]));
evalScripts[i].SetDestination(standardScripts[i].GetID());
}

Expand Down Expand Up @@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(set)
for (int i = 0; i < 4; i++)
{
key[i].MakeNewKey(true);
keystore.AddKey(key[i]);
BOOST_CHECK(keystore.AddKey(key[i]));
keys.push_back(key[i]);
}

Expand All @@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE(set)
for (int i = 0; i < 4; i++)
{
outer[i].SetDestination(inner[i].GetID());
keystore.AddCScript(inner[i]);
BOOST_CHECK(keystore.AddCScript(inner[i]));
}

CTransaction txFrom; // Funding transaction:
Expand Down Expand Up @@ -200,15 +200,24 @@ BOOST_AUTO_TEST_CASE(is)
p2sh << OP_HASH160 << dummy << OP_EQUAL;
BOOST_CHECK(p2sh.IsPayToScriptHash());

std::vector<unsigned char> direct = {OP_HASH160, 20};
direct.insert(direct.end(), 20, 0);
direct.push_back(OP_EQUAL);
BOOST_CHECK(CScript(direct.begin(), direct.end()).IsPayToScriptHash());

// Not considered pay-to-script-hash if using one of the OP_PUSHDATA opcodes:
static const unsigned char direct[] = { OP_HASH160, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUAL };
BOOST_CHECK(CScript(direct, direct+sizeof(direct)).IsPayToScriptHash());
static const unsigned char pushdata1[] = { OP_HASH160, OP_PUSHDATA1, 20, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUAL };
BOOST_CHECK(!CScript(pushdata1, pushdata1+sizeof(pushdata1)).IsPayToScriptHash());
static const unsigned char pushdata2[] = { OP_HASH160, OP_PUSHDATA2, 20,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUAL };
BOOST_CHECK(!CScript(pushdata2, pushdata2+sizeof(pushdata2)).IsPayToScriptHash());
static const unsigned char pushdata4[] = { OP_HASH160, OP_PUSHDATA4, 20,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, OP_EQUAL };
BOOST_CHECK(!CScript(pushdata4, pushdata4+sizeof(pushdata4)).IsPayToScriptHash());
std::vector<unsigned char> pushdata1 = {OP_HASH160, OP_PUSHDATA1, 20};
pushdata1.insert(pushdata1.end(), 20, 0);
pushdata1.push_back(OP_EQUAL);
BOOST_CHECK(!CScript(pushdata1.begin(), pushdata1.end()).IsPayToScriptHash());
std::vector<unsigned char> pushdata2 = {OP_HASH160, OP_PUSHDATA2, 20, 0};
pushdata2.insert(pushdata2.end(), 20, 0);
pushdata2.push_back(OP_EQUAL);
BOOST_CHECK(!CScript(pushdata2.begin(), pushdata2.end()).IsPayToScriptHash());
std::vector<unsigned char> pushdata4 = {OP_HASH160, OP_PUSHDATA4, 20, 0, 0, 0};
pushdata4.insert(pushdata4.end(), 20, 0);
pushdata4.push_back(OP_EQUAL);
BOOST_CHECK(!CScript(pushdata4.begin(), pushdata4.end()).IsPayToScriptHash());

CScript not_p2sh;
BOOST_CHECK(!not_p2sh.IsPayToScriptHash());
Expand Down Expand Up @@ -243,11 +252,11 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
std::map<uint256, std::pair<CTxIndex, CTransaction> > mapInputs;
CBasicKeyStore keystore;
CKey key[3];
vector<CKey> keys;
std::vector<CKey> keys;
for (int i = 0; i < 3; i++)
{
key[i].MakeNewKey(true);
keystore.AddKey(key[i]);
BOOST_CHECK(keystore.AddKey(key[i]));
keys.push_back(key[i]);
}

Expand All @@ -256,7 +265,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)

// First three are standard:
CScript pay1; pay1.SetDestination(key[0].GetPubKey().GetID());
keystore.AddCScript(pay1);
BOOST_CHECK(keystore.AddCScript(pay1));
CScript payScriptHash1; payScriptHash1.SetDestination(pay1.GetID());
CScript pay1of3; pay1of3.SetMultisig(1, keys);

Expand All @@ -277,7 +286,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
oneOfEleven << OP_11 << OP_CHECKMULTISIG;
txFrom.vout[5].scriptPubKey.SetDestination(oneOfEleven.GetID());

mapInputs[txFrom.GetHash()] = make_pair(CTxIndex(), txFrom);
mapInputs[txFrom.GetHash()] = std::make_pair(CTxIndex(), txFrom);

CTransaction txTo;
txTo.vout.resize(1);
Expand Down