diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-05 11:09:19 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-05 11:09:26 +0100 |
commit | 43e8150ef69093c906c4406ce58c1fd21fee898e (patch) | |
tree | c6ae423fbe59660656b5b689812d8a7851f9e06d /src | |
parent | 613bda418f8358625eb860f4d7e6f0d2533cabe9 (diff) | |
parent | 2efc43874cedde7e022ac8f1051c7984331543fa (diff) |
Merge #9269: Align struct COrphan definition
2efc438 Align struct COrphan definition (Pieter Wuille)
Diffstat (limited to 'src')
-rw-r--r-- | src/net_processing.cpp | 1 | ||||
-rw-r--r-- | src/test/DoS_tests.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index c37faf49f0..4bee13a7bf 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -50,6 +50,7 @@ struct IteratorComparator }; struct COrphanTx { + // When modifying, adapt the copy of this definition in tests/DoS_tests. CTransaction tx; NodeId fromPeer; int64_t nTimeExpire; diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 1a818a5756..a8c3c4ebb9 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -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; |