diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-06-09 10:02:00 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-06-22 00:06:17 +0200 |
| commit | d38da59bf68fbb37535e2579bfb7355a16baed0e (patch) | |
| tree | fb9821f60f32fa8ea0564d1149fa37ab396ead97 /src/net.cpp | |
| parent | 4949004d68dc08382df2c34ae519c1b1cfd60f1a (diff) | |
| download | bitcoin-d38da59bf68fbb37535e2579bfb7355a16baed0e.tar.xz | |
Code simplifications after CTransaction::GetHash() caching
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net.cpp b/src/net.cpp index 757a06aaed..fe6b07aa94 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1808,17 +1808,17 @@ instance_of_cnetcleanup; -void RelayTransaction(const CTransaction& tx, const uint256& hash) +void RelayTransaction(const CTransaction& tx) { CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); ss.reserve(10000); ss << tx; - RelayTransaction(tx, hash, ss); + RelayTransaction(tx, ss); } -void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataStream& ss) +void RelayTransaction(const CTransaction& tx, const CDataStream& ss) { - CInv inv(MSG_TX, hash); + CInv inv(MSG_TX, tx.GetHash()); { LOCK(cs_mapRelay); // Expire old relay messages @@ -1840,7 +1840,7 @@ void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataSt LOCK(pnode->cs_filter); if (pnode->pfilter) { - if (pnode->pfilter->IsRelevantAndUpdate(tx, hash)) + if (pnode->pfilter->IsRelevantAndUpdate(tx)) pnode->PushInventory(inv); } else pnode->PushInventory(inv); |