aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <[email protected]>2016-12-02 19:24:23 -0800
committerPieter Wuille <[email protected]>2016-12-05 00:35:07 -0800
commit2efc43874cedde7e022ac8f1051c7984331543fa (patch)
treea2b054364b11a9f77b74b63e25096449255762d2 /src
parentMerge #9260: Mrs Peacock in The Library with The Candlestick (killed main.{h,... (diff)
downloaddiscoin-2efc43874cedde7e022ac8f1051c7984331543fa.tar.xz
discoin-2efc43874cedde7e022ac8f1051c7984331543fa.zip
Align struct COrphan definition
Diffstat (limited to 'src')
-rw-r--r--src/net_processing.cpp1
-rw-r--r--src/test/DoS_tests.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 747167264..5a415cabb 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 1a818a575..a8c3c4ebb 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;