Merge #9269: Align struct COrphan definition

2efc438 Align struct COrphan definition (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2016-12-05 11:09:19 +01:00 committed by Alexander Block
parent 2feda90d5d
commit 9782c18312
2 changed files with 2 additions and 0 deletions

View File

@ -63,6 +63,7 @@ struct IteratorComparator
};
struct COrphanTx {
// When modifying, adapt the copy of this definition in tests/DoS_tests.
CTransaction tx;
NodeId fromPeer;
int64_t nTimeExpire;

View File

@ -29,6 +29,7 @@ extern unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans);
struct COrphanTx {
CTransaction tx;
NodeId fromPeer;
int64_t nTimeExpire;
};
extern std::map<uint256, COrphanTx> mapOrphanTransactions;
extern std::map<uint256, std::set<uint256> > mapOrphanTransactionsByPrev;