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, refactor: Update script_tests from upstream #2360

Merged
merged 3 commits into from
Oct 19, 2021
Merged

test, refactor: Update script_tests from upstream #2360

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe87496
Add copyright header, clean up includes
barton2526 Oct 14, 2021
2608222
tests: Test for expected return values when calling functions return…
barton2526 Oct 14, 2021
11e16de
refactor: remove use of boost::algorithm::replace_first
barton2526 Oct 14, 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
35 changes: 19 additions & 16 deletions src/test/script_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
// Copyright (c) 2011-2020 The Bitcoin Core developers
jamescowens marked this conversation as resolved.
Show resolved Hide resolved
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

#include <vector>
#include <sstream>
#include <util/strencodings.h>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/preprocessor/stringize.hpp>
#include <boost/test/unit_test.hpp>

#include "main.h"
#include "wallet/wallet.h"
#include <main.h>
#include <wallet/wallet.h>

#include "test/data/script_valid.json.h"
#include "test/data/script_invalid.json.h"
#include <test/data/script_valid.json.h>
#include <test/data/script_invalid.json.h>

#include <cstdint>
#include <univalue.h>
Expand All @@ -39,8 +41,9 @@ CScript ParseScript(string s)
string strName(name);
mapOpNames[strName] = (opcodetype)op;
// Convenience: OP_ADD and just ADD are both recognized:
replace_first(strName, "OP_", "");
mapOpNames[strName] = (opcodetype)op;
if (strName.compare(0, 3, "OP_") == 0) { // strName starts with "OP_"
mapOpNames[strName.substr(3)] = static_cast<opcodetype>(op);
}
}
}

Expand Down Expand Up @@ -318,7 +321,7 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
CKey key;
key.MakeNewKey(i%2 == 1);
keys.push_back(key);
keystore.AddKey(key);
BOOST_CHECK(keystore.AddKey(key));
}

CTransaction txFrom;
Expand All @@ -338,28 +341,28 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
BOOST_CHECK(combined.empty());

// Single signature case:
SignSignature(keystore, txFrom, txTo, 0); // changes scriptSig
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0)); // changes scriptSig
combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
BOOST_CHECK(combined == scriptSig);
combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
BOOST_CHECK(combined == scriptSig);
CScript scriptSigCopy = scriptSig;
// Signing again will give a different, valid signature:
SignSignature(keystore, txFrom, txTo, 0);
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0));
combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSigCopy, scriptSig);
BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);

// P2SH, single-signature case:
CScript pkSingle; pkSingle << keys[0].GetPubKey() << OP_CHECKSIG;
keystore.AddCScript(pkSingle);
BOOST_CHECK(keystore.AddCScript(pkSingle));
scriptPubKey.SetDestination(pkSingle.GetID());
SignSignature(keystore, txFrom, txTo, 0);
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0));
combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
BOOST_CHECK(combined == scriptSig);
combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
BOOST_CHECK(combined == scriptSig);
scriptSigCopy = scriptSig;
SignSignature(keystore, txFrom, txTo, 0);
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0));
combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSigCopy, scriptSig);
BOOST_CHECK(combined == scriptSigCopy || combined == scriptSig);
// dummy scriptSigCopy with placeholder, should always choose non-placeholder:
Expand All @@ -371,8 +374,8 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)

// Hardest case: Multisig 2-of-3
scriptPubKey.SetMultisig(2, keys);
keystore.AddCScript(scriptPubKey);
SignSignature(keystore, txFrom, txTo, 0);
BOOST_CHECK(keystore.AddCScript(scriptPubKey));
BOOST_CHECK(SignSignature(keystore, txFrom, txTo, 0));
combined = CombineSignatures(scriptPubKey, txTo, 0, scriptSig, empty);
BOOST_CHECK(combined == scriptSig);
combined = CombineSignatures(scriptPubKey, txTo, 0, empty, scriptSig);
Expand Down