Skip to content

Backport bitcoin#25694: refactor: Make CTransaction constructor explicit #50

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
DashCoreAutoGuix merged 1 commit into from
May 31, 2025
Merged

Backport bitcoin#25694: refactor: Make CTransaction constructor explicit #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/primitives/transaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@

#include <consensus/amount.h>
#include <hash.h>
#include <script/script.h>
#include <serialize.h>
#include <tinyformat.h>
#include <uint256.h>
#include <util/strencodings.h>
#include <version.h>

#include <assert.h>
#include <cassert>
#include <stdexcept>

std::string COutPoint::ToString() const
{
Expand Down
14 changes: 12 additions & 2 deletions src/primitives/transaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,20 @@
#define BITCOIN_PRIMITIVES_TRANSACTION_H

#include <consensus/amount.h>
#include <prevector.h>
#include <script/script.h>
#include <serialize.h>
#include <uint256.h>

#include <cstddef>
#include <cstdint>
#include <ios>
#include <limits>
#include <memory>
#include <string>
#include <tuple>
#include <utility>
#include <vector>

/** Transaction types */
enum {
Expand Down Expand Up @@ -228,7 +238,7 @@ class CTransaction
public:
/** Convert a CMutableTransaction into a CTransaction. */
explicit CTransaction(const CMutableTransaction& tx);
CTransaction(CMutableTransaction&& tx);
explicit CTransaction(CMutableTransaction&& tx);

template <typename Stream>
inline void Serialize(Stream& s) const {
Expand Down Expand Up @@ -305,7 +315,7 @@ struct CMutableTransaction
uint32_t nLockTime;
std::vector<uint8_t> vExtraPayload; // only available for special transaction types

CMutableTransaction();
explicit CMutableTransaction();
explicit CMutableTransaction(const CTransaction& tx);

SERIALIZE_METHODS(CMutableTransaction, obj)
Expand Down
4 changes: 2 additions & 2 deletions src/test/evo_assetlocks_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ BOOST_FIXTURE_TEST_CASE(evo_assetlock, TestChain100Setup)
CKey key;
key.MakeNewKey(true);

const CTransaction tx = CreateAssetLockTx(keystore, coins, key);
const CTransaction tx{CreateAssetLockTx(keystore, coins, key)};
std::string reason;
BOOST_CHECK(IsStandardTx(CTransaction(tx), reason));

Expand Down Expand Up @@ -304,7 +304,7 @@ BOOST_FIXTURE_TEST_CASE(evo_assetunlock, TestChain100Setup)
CKey key;
key.MakeNewKey(true);

const CTransaction tx = CreateAssetUnlockTx(keystore, key);
const CTransaction tx{CreateAssetUnlockTx(keystore, key)};
std::string reason;
BOOST_CHECK(IsStandardTx(CTransaction(tx), reason));

Expand Down
20 changes: 10 additions & 10 deletions src/test/script_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,8 +1410,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_returns_true)
CScript scriptSig;

scriptPubKey << OP_1;
CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};

CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
stream << spendTx;
Expand All @@ -1432,8 +1432,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_index_err)
CScript scriptSig;

scriptPubKey << OP_EQUAL;
CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};

CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
stream << spendTx;
Expand All @@ -1454,8 +1454,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_size)
CScript scriptSig;

scriptPubKey << OP_EQUAL;
CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};

CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
stream << spendTx;
Expand All @@ -1476,8 +1476,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_tx_serialization)
CScript scriptSig;

scriptPubKey << OP_EQUAL;
CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};

CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
stream << 0xffffffff;
Expand All @@ -1498,8 +1498,8 @@ BOOST_AUTO_TEST_CASE(dashconsensus_verify_script_invalid_flags)
CScript scriptSig;

scriptPubKey << OP_EQUAL;
CTransaction creditTx = BuildCreditingTransaction(scriptPubKey);
CTransaction spendTx = BuildSpendingTransaction(scriptSig, creditTx);
CTransaction creditTx{BuildCreditingTransaction(scriptPubKey)};
CTransaction spendTx{BuildSpendingTransaction(scriptSig, creditTx)};

CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
stream << spendTx;
Expand Down