sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 13:32:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #10368: [wallet] Remove helper conversion operator from wallet

Browse Source 
5a5e4e9 [wallet] Remove CTransaction&() helper conversion operator from wallet implementation. (Karl-Johan Alm)

Pull request description:

  The `CTransaction&()` operator in `CMerkleTx` makes conversion into `CTransaction`s transparent, but was marked as to-be-removed in favor of explicitly getting the `tx` ivar, presumably as the operator can lead to ambiguous behavior and makes the code harder to follow.

  This PR removes the operator and adapts callers. This includes some cases of `static_cast<CTransaction>(wtx)` → `*wtx.tx`, which is definitely an improvement.

Tree-SHA512: 95856fec7194d6a79615ea1c322abfcd6bcedf6ffd0cfa89bbdd332ce13035fa52dd4b828d20df673072dde1be64b79c513529a6f422dd5f0961ce722a32d56a
This commit is contained in:
Wladimir J. van der Laan 2017-11-09 14:22:22 +01:00 committed by Pasta
parent 3bae57af8d
commit 354f57a838
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
10 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/transactiondesc.cpp
View File

@ -25,7 +25,7 @@
QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
if (!CheckFinalTx(wtx)) if (!CheckFinalTx(*wtx.tx))
{ {
if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD) if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)
return tr("Open for %n more block(s)", "", wtx.tx->nLockTime - chainActive.Height()); return tr("Open for %n more block(s)", "", wtx.tx->nLockTime - chainActive.Height());

2
src/qt/transactionrecord.cpp
View File

@ -285,7 +285,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx, int chainLockHeight)
status.label = QString::fromStdString(addrBookIt->second.name); status.label = QString::fromStdString(addrBookIt->second.name);
} }
if (!CheckFinalTx(wtx)) if (!CheckFinalTx(*wtx.tx))
{ {
if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD) if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)
{ {

2
src/qt/transactiontablemodel.cpp
View File

@ -244,7 +244,7 @@ public:
std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash); std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
if(mi != wallet->mapWallet.end()) if(mi != wallet->mapWallet.end())
{ {
std::string strHex = EncodeHexTx(static_cast<CTransaction>(mi->second)); std::string strHex = EncodeHexTx(*mi->second.tx);
return QString::fromStdString(strHex); return QString::fromStdString(strHex);
} }
return QString(); return QString();

2
src/qt/walletmodeltransaction.cpp
View File

@ -33,7 +33,7 @@ CWalletTx *WalletModelTransaction::getTransaction() const
unsigned int WalletModelTransaction::getTransactionSize() unsigned int WalletModelTransaction::getTransactionSize()
{ {
return (!walletTransaction ? 0 : (::GetSerializeSize(walletTransaction->tx, SER_NETWORK, PROTOCOL_VERSION))); return (!walletTransaction ? 0 : (::GetSerializeSize(*walletTransaction->tx, SER_NETWORK, PROTOCOL_VERSION)));
} }
CAmount WalletModelTransaction::getTransactionFee() const CAmount WalletModelTransaction::getTransactionFee() const

2
src/wallet/rpcdump.cpp
View File

@ -341,7 +341,7 @@ UniValue importprunedfunds(const JSONRPCRequest& request)
LOCK2(cs_main, pwallet->cs_wallet); LOCK2(cs_main, pwallet->cs_wallet);
if (pwallet->IsMine(wtx)) { if (pwallet->IsMine(*wtx.tx)) {
pwallet->AddToWallet(wtx, false); pwallet->AddToWallet(wtx, false);
return NullUniValue; return NullUniValue;
} }

2
src/wallet/rpcwallet.cpp
View File

@ -1997,7 +1997,7 @@ UniValue gettransaction(const JSONRPCRequest& request)
ListTransactions(pwallet, wtx, "*", 0, false, details, filter); ListTransactions(pwallet, wtx, "*", 0, false, details, filter);
entry.push_back(Pair("details", details)); entry.push_back(Pair("details", details));
std::string strHex = EncodeHexTx(static_cast<CTransaction>(wtx)); std::string strHex = EncodeHexTx(*wtx.tx);
entry.push_back(Pair("hex", strHex)); entry.push_back(Pair("hex", strHex));
return entry; return entry;

4
src/wallet/test/accounting_tests.cpp
View File

@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
wtx.mapValue["comment"] = "y"; wtx.mapValue["comment"] = "y";
{ {
CMutableTransaction tx(wtx); CMutableTransaction tx(*wtx.tx);
--tx.nLockTime; // Just to change the hash :) --tx.nLockTime; // Just to change the hash :)
wtx.SetTx(MakeTransactionRef(std::move(tx))); wtx.SetTx(MakeTransactionRef(std::move(tx)));
} }
@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
wtx.mapValue["comment"] = "x"; wtx.mapValue["comment"] = "x";
{ {
CMutableTransaction tx(wtx); CMutableTransaction tx(*wtx.tx);
--tx.nLockTime; // Just to change the hash :) --tx.nLockTime; // Just to change the hash :)
wtx.SetTx(MakeTransactionRef(std::move(tx))); wtx.SetTx(MakeTransactionRef(std::move(tx)));
} }

23
src/wallet/wallet.cpp
View File

@ -1493,6 +1493,7 @@ int CWallet::GetRealOutpointPrivateSendRounds(const COutPoint& outpoint, int nRo
uint256 hash = outpoint.hash; uint256 hash = outpoint.hash;
unsigned int nout = outpoint.n; unsigned int nout = outpoint.n;
// TODO wtx should refer to a CWalletTx object, not a pointer, based on surrounding code
const CWalletTx* wtx = GetWalletTx(hash); const CWalletTx* wtx = GetWalletTx(hash);
if(wtx != nullptr) if(wtx != nullptr)
{ {
@ -1500,7 +1501,7 @@ int CWallet::GetRealOutpointPrivateSendRounds(const COutPoint& outpoint, int nRo
if (mdwi == mDenomWtxes.end()) { if (mdwi == mDenomWtxes.end()) {
// not known yet, let's add it // not known yet, let's add it
LogPrint(BCLog::PRIVATESEND, "GetRealOutpointPrivateSendRounds INSERTING %s\n", hash.ToString()); LogPrint(BCLog::PRIVATESEND, "GetRealOutpointPrivateSendRounds INSERTING %s\n", hash.ToString());
mDenomWtxes[hash] = CMutableTransaction(*wtx); mDenomWtxes[hash] = CMutableTransaction(*wtx->tx);
} else if(mDenomWtxes[hash].vout[nout].nRounds != -10) { } else if(mDenomWtxes[hash].vout[nout].nRounds != -10) {
// found and it's not an initial value, just return it // found and it's not an initial value, just return it
return mDenomWtxes[hash].vout[nout].nRounds; return mDenomWtxes[hash].vout[nout].nRounds;
@ -2043,7 +2044,7 @@ bool CWalletTx::RelayWalletTransaction(CConnman* connman)
LogPrintf("Relaying wtx %s\n", hash.ToString()); LogPrintf("Relaying wtx %s\n", hash.ToString());
if (connman) { if (connman) {
connman->RelayTransaction((CTransaction)*this); connman->RelayTransaction(*tx);
return true; return true;
} }
} }
@ -2075,7 +2076,7 @@ CAmount CWalletTx::GetDebit(const isminefilter& filter) const
debit += nDebitCached; debit += nDebitCached;
else else
{ {
nDebitCached = pwallet->GetDebit(*this, ISMINE_SPENDABLE); nDebitCached = pwallet->GetDebit(*tx, ISMINE_SPENDABLE);
fDebitCached = true; fDebitCached = true;
debit += nDebitCached; debit += nDebitCached;
} }
@ -2086,7 +2087,7 @@ CAmount CWalletTx::GetDebit(const isminefilter& filter) const
debit += nWatchDebitCached; debit += nWatchDebitCached;
else else
{ {
nWatchDebitCached = pwallet->GetDebit(*this, ISMINE_WATCH_ONLY); nWatchDebitCached = pwallet->GetDebit(*tx, ISMINE_WATCH_ONLY);
fWatchDebitCached = true; fWatchDebitCached = true;
debit += nWatchDebitCached; debit += nWatchDebitCached;
} }
@ -2108,7 +2109,7 @@ CAmount CWalletTx::GetCredit(const isminefilter& filter) const
credit += nCreditCached; credit += nCreditCached;
else else
{ {
nCreditCached = pwallet->GetCredit(*this, ISMINE_SPENDABLE); nCreditCached = pwallet->GetCredit(*tx, ISMINE_SPENDABLE);
fCreditCached = true; fCreditCached = true;
credit += nCreditCached; credit += nCreditCached;
} }
@ -2119,7 +2120,7 @@ CAmount CWalletTx::GetCredit(const isminefilter& filter) const
credit += nWatchCreditCached; credit += nWatchCreditCached;
else else
{ {
nWatchCreditCached = pwallet->GetCredit(*this, ISMINE_WATCH_ONLY); nWatchCreditCached = pwallet->GetCredit(*tx, ISMINE_WATCH_ONLY);
fWatchCreditCached = true; fWatchCreditCached = true;
credit += nWatchCreditCached; credit += nWatchCreditCached;
} }
@ -2133,7 +2134,7 @@ CAmount CWalletTx::GetImmatureCredit(bool fUseCache) const
{ {
if (fUseCache && fImmatureCreditCached) if (fUseCache && fImmatureCreditCached)
return nImmatureCreditCached; return nImmatureCreditCached;
nImmatureCreditCached = pwallet->GetCredit(*this, ISMINE_SPENDABLE); nImmatureCreditCached = pwallet->GetCredit(*tx, ISMINE_SPENDABLE);
fImmatureCreditCached = true; fImmatureCreditCached = true;
return nImmatureCreditCached; return nImmatureCreditCached;
} }
@ -2177,7 +2178,7 @@ CAmount CWalletTx::GetImmatureWatchOnlyCredit(const bool& fUseCache) const
{ {
if (fUseCache && fImmatureWatchCreditCached) if (fUseCache && fImmatureWatchCreditCached)
return nImmatureWatchCreditCached; return nImmatureWatchCreditCached;
nImmatureWatchCreditCached = pwallet->GetCredit(*this, ISMINE_WATCH_ONLY); nImmatureWatchCreditCached = pwallet->GetCredit(*tx, ISMINE_WATCH_ONLY);
fImmatureWatchCreditCached = true; fImmatureWatchCreditCached = true;
return nImmatureWatchCreditCached; return nImmatureWatchCreditCached;
} }
@ -2297,7 +2298,7 @@ CAmount CWalletTx::GetChange() const
{ {
if (fChangeCached) if (fChangeCached)
return nChangeCached; return nChangeCached;
nChangeCached = pwallet->GetChange(*this); nChangeCached = pwallet->GetChange(*tx);
fChangeCached = true; fChangeCached = true;
return nChangeCached; return nChangeCached;
} }
@ -2311,7 +2312,7 @@ bool CWalletTx::InMempool() const
bool CWalletTx::IsTrusted() const bool CWalletTx::IsTrusted() const
{ {
// Quick answer in most cases // Quick answer in most cases
if (!CheckFinalTx(*this)) if (!CheckFinalTx(*tx))
return false; return false;
int nDepth = GetDepthInMainChain(); int nDepth = GetDepthInMainChain();
if (nDepth >= 1) if (nDepth >= 1)
@ -2677,7 +2678,7 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
for (auto pcoin : GetSpendableTXs()) { for (auto pcoin : GetSpendableTXs()) {
const uint256& wtxid = pcoin->GetHash(); const uint256& wtxid = pcoin->GetHash();
if (!CheckFinalTx(*pcoin)) if (!CheckFinalTx(*pcoin->tx))
continue; continue;
if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0) if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)

4
src/wallet/wallet.h
View File

@ -229,10 +229,6 @@ public:
Init(); Init();
} }
/** Helper conversion operator to allow passing CMerkleTx where CTransaction is expected.
* TODO: adapt callers and remove this operator. */
operator const CTransaction&() const { return *tx; }
void Init() void Init()
{ {
hashBlock = uint256(); hashBlock = uint256();

2
src/wallet/walletdb.cpp
View File

@ -275,7 +275,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
CWalletTx wtx; CWalletTx wtx;
ssValue >> wtx; ssValue >> wtx;
CValidationState state; CValidationState state;
if (!(CheckTransaction(wtx, state) && (wtx.GetHash() == hash) && state.IsValid())) if (!(CheckTransaction(*wtx.tx, state) && (wtx.GetHash() == hash) && state.IsValid()))
return false; return false;
// Undo serialize changes in 31600 // Undo serialize changes in 31600