Browse Source

Move recently introduced CTransAction::IsEquivalentTo to CWalletTx

CTransAction::IsEquivalentTo was introduced in #5881.
This functionality is only useful to the wallet, and should never have
been added to the primitive transaction type.
0.13
Wladimir J. van der Laan 10 years ago
parent
commit
5a7304b69d
  1. 9
      src/primitives/transaction.cpp
  2. 3
      src/primitives/transaction.h
  3. 9
      src/wallet/wallet.cpp
  4. 3
      src/wallet/wallet.h

9
src/primitives/transaction.cpp

@ -87,15 +87,6 @@ CTransaction& CTransaction::operator=(const CTransaction &tx) { @@ -87,15 +87,6 @@ CTransaction& CTransaction::operator=(const CTransaction &tx) {
return *this;
}
bool CTransaction::IsEquivalentTo(const CTransaction& tx) const
{
CMutableTransaction tx1 = *this;
CMutableTransaction tx2 = tx;
for (unsigned int i = 0; i < tx1.vin.size(); i++) tx1.vin[i].scriptSig = CScript();
for (unsigned int i = 0; i < tx2.vin.size(); i++) tx2.vin[i].scriptSig = CScript();
return CTransaction(tx1) == CTransaction(tx2);
}
CAmount CTransaction::GetValueOut() const
{
CAmount nValueOut = 0;

3
src/primitives/transaction.h

@ -222,9 +222,6 @@ public: @@ -222,9 +222,6 @@ public:
return hash;
}
// True if only scriptSigs are different
bool IsEquivalentTo(const CTransaction& tx) const;
// Return sum of txouts.
CAmount GetValueOut() const;
// GetValueIn() is a method on CCoinsViewCache, because

9
src/wallet/wallet.cpp

@ -1331,6 +1331,15 @@ bool CWalletTx::IsTrusted() const @@ -1331,6 +1331,15 @@ bool CWalletTx::IsTrusted() const
return true;
}
bool CWalletTx::IsEquivalentTo(const CWalletTx& tx) const
{
CMutableTransaction tx1 = *this;
CMutableTransaction tx2 = tx;
for (unsigned int i = 0; i < tx1.vin.size(); i++) tx1.vin[i].scriptSig = CScript();
for (unsigned int i = 0; i < tx2.vin.size(); i++) tx2.vin[i].scriptSig = CScript();
return CTransaction(tx1) == CTransaction(tx2);
}
std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
{
std::vector<uint256> result;

3
src/wallet/wallet.h

@ -378,6 +378,9 @@ public: @@ -378,6 +378,9 @@ public:
return (GetDebit(filter) > 0);
}
// True if only scriptSigs are different
bool IsEquivalentTo(const CWalletTx& tx) const;
bool IsTrusted() const;
bool WriteToDisk(CWalletDB *pwalletdb);

Loading…
Cancel
Save