Merge bitcoin#9269: Align struct COrphan definition

2efc438 Align struct COrphan definition (Pieter Wuille)
absolute-community · Dec 5, 2016 · 43e8150 · 43e8150
2 parents 613bda4 + 2efc438
commit 43e8150
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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;