Merge pull request dogecoin#3592 from patricklodder/1.14.8-txtracker

1.14.8: Backport TxRequestTracker
chromatic · Jul 26, 2024 · 2599045 · 2599045
2 parents 25136a5 + 6fe3d55
commit 2599045
Show file tree

Hide file tree

Showing 13 changed files with 1,963 additions and 482 deletions.
diff --git a/qa/rpc-tests/p2p-tx-download.py b/qa/rpc-tests/p2p-tx-download.py
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -111,7 +111,6 @@ BITCOIN_CORE_H = \
   key.h \
   keystore.h \
   dbwrapper.h \
-  limitedmap.h \
   memusage.h \
   merkleblock.h \
   miner.h \
@@ -154,9 +153,11 @@ BITCOIN_CORE_H = \
   torcontrol.h \
   txdb.h \
   txmempool.h \
+  txrequest.h \
   ui_interface.h \
   undo.h \
   util.h \
+  utilmemory.h \
   utilmoneystr.h \
   utiltime.h \
   utilstring.h \
@@ -218,6 +219,7 @@ libdogecoin_server_a_SOURCES = \
   torcontrol.cpp \
   txdb.cpp \
   txmempool.cpp \
+  txrequest.cpp \
   ui_interface.cpp \
   validation.cpp \
   validationinterface.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -100,7 +100,6 @@ BITCOIN_TESTS =\
   test/getarg_tests.cpp \
   test/hash_tests.cpp \
   test/key_tests.cpp \
-  test/limitedmap_tests.cpp \
   test/dbwrapper_tests.cpp \
   test/main_tests.cpp \
   test/mempool_tests.cpp \
@@ -136,6 +135,7 @@ BITCOIN_TESTS =\
   test/testutil.h \
   test/timedata_tests.cpp \
   test/transaction_tests.cpp \
+  test/txrequest_tests.cpp \
   test/txvalidationcache_tests.cpp \
   test/versionbits_tests.cpp \
   test/uint256_tests.cpp \

diff --git a/src/limitedmap.h b/src/limitedmap.h
diff --git a/src/net.h b/src/net.h
@@ -13,7 +13,6 @@
 #include "bloom.h"
 #include "compat.h"
 #include "hash.h"
-#include "limitedmap.h"
 #include "netaddress.h"
 #include "protocol.h"
 #include "random.h"