diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 20:57:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 20:57:39 +0200 |
| commit | 5a7304b69dcdb3323fbade3a150be94b42d8ab43 (patch) | |
| tree | e4038cf2ee67d155abe711b6c8456b5cd5bf87f4 /src/primitives | |
| parent | 3f16971442f1b52f94759b15998bc82e82a90aea (diff) | |
| download | bitcoin-5a7304b69dcdb3323fbade3a150be94b42d8ab43.tar.xz | |
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.
Diffstat (limited to 'src/primitives')
| -rw-r--r-- | src/primitives/transaction.cpp | 9 | ||||
| -rw-r--r-- | src/primitives/transaction.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index d864a9b6d3..606dbea798 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -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; diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 0c9ebb7b88..6cfd93a9a1 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -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 |