Skip to content

test: Update sigopcount_tests and transaction_tests from upstream #2361

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

Merged
merged 3 commits into from
Oct 19, 2021
Merged

test: Update sigopcount_tests and transaction_tests from upstream #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b41a7e
Add copyright header, clean up includes, remove namespace
barton2526 Oct 15, 2021
c819608
transaction tests - header, includes, namespace
barton2526 Oct 15, 2021
0db2f39
Test for expected return values
barton2526 Oct 15, 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
10 changes: 6 additions & 4 deletions src/test/sigopcount_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// Copyright (c) 2012-2017 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 <vector>
#include <boost/test/unit_test.hpp>

#include "script.h"
#include "key.h"

using namespace std;
#include <script.h>
#include <key.h>

// Helpers:
static std::vector<unsigned char>
Expand Down
16 changes: 10 additions & 6 deletions src/test/transaction_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// Copyright (c) 2011-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 <map>
#include <string>
#include <boost/test/unit_test.hpp>

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

#include "test/data/tx_valid.json.h"
#include "test/data/tx_invalid.json.h"
#include <test/data/tx_valid.json.h>
#include <test/data/tx_invalid.json.h>

#include <univalue.h>

Expand Down Expand Up @@ -257,7 +261,7 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, MapPrevTx& inputsRet)
for (int i = 0; i < 4; i++)
{
key[i].MakeNewKey(i % 2);
keystoreRet.AddKey(key[i]);
BOOST_CHECK(keystoreRet.AddKey(key[i]));
}

// Create some dummy input transactions
Expand Down