diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-15 08:58:50 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-15 08:59:40 +0200 |
| commit | efc059322ceffbc7485001bebc88dd2fdcb60c4d (patch) | |
| tree | a40c2b481dc74808f0d176d98efefd75db15bd70 /src/net.h | |
| parent | bbd210d9275ac892184e1dd5dc2de09d3cd9f28e (diff) | |
| parent | 38c310299cfef419d42744362b90c1700b598953 (diff) | |
| download | bitcoin-efc059322ceffbc7485001bebc88dd2fdcb60c4d.tar.xz | |
Merge #7877: Change mapRelay to store CTransactions
38c3102 Change mapRelay to store CTransactions (Pieter Wuille)
Diffstat (limited to 'src/net.h')
| -rw-r--r-- | src/net.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -161,8 +161,8 @@ extern int nMaxConnections; extern std::vector<CNode*> vNodes; extern CCriticalSection cs_vNodes; -extern std::map<CInv, CDataStream> mapRelay; -extern std::deque<std::pair<int64_t, CInv> > vRelayExpiration; +extern std::map<uint256, CTransaction> mapRelay; +extern std::deque<std::pair<int64_t, uint256> > vRelayExpiration; extern CCriticalSection cs_mapRelay; extern limitedmap<uint256, int64_t> mapAlreadyAskedFor; @@ -773,7 +773,6 @@ public: class CTransaction; void RelayTransaction(const CTransaction& tx, CFeeRate feerate); -void RelayTransaction(const CTransaction& tx, CFeeRate feerate, const CDataStream& ss); /** Access to the (IP) address database (peers.dat) */ class CAddrDB |