test: refactor: deduplicate DEFAULT_{ANCESTOR,DESCENDANT}_LIMIT constants

theStack · theStack · commit b4a5ab96b429 · 2022-08-09T15:22:38.000+02:00
diff --git a/test/functional/mempool_package_onemore.py b/test/functional/mempool_package_onemore.py
@@ -7,6 +7,9 @@
    size.
 """
 
+from test_framework.messages import (
+    DEFAULT_ANCESTOR_LIMIT,
+)
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
@@ -15,10 +18,6 @@
 from test_framework.wallet import MiniWallet
 
 
-DEFAULT_ANCESTOR_LIMIT = 25
-DEFAULT_DESCENDANT_LIMIT = 25
-
-
 class MempoolPackagesTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
@@ -7,7 +7,11 @@
 from decimal import Decimal
 
 from test_framework.blocktools import COINBASE_MATURITY
-from test_framework.messages import COIN
+from test_framework.messages import (
+    COIN,
+    DEFAULT_ANCESTOR_LIMIT,
+    DEFAULT_DESCENDANT_LIMIT,
+)
 from test_framework.p2p import P2PTxInvStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
@@ -16,14 +20,13 @@
     chain_transaction,
 )
 
-# default limits
-DEFAULT_ANCESTOR_LIMIT = 25
-DEFAULT_DESCENDANT_LIMIT = 25
+
 # custom limits for node1
 CUSTOM_ANCESTOR_LIMIT = 5
 CUSTOM_DESCENDANT_LIMIT = 10
 assert CUSTOM_DESCENDANT_LIMIT >= CUSTOM_ANCESTOR_LIMIT
 
+
 class MempoolPackagesTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 2
diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py
@@ -65,6 +65,9 @@
 
 WITNESS_SCALE_FACTOR = 4
 
+DEFAULT_ANCESTOR_LIMIT = 25    # default max number of in-mempool ancestors
+DEFAULT_DESCENDANT_LIMIT = 25  # default max number of in-mempool descendants
+
 
 def sha256(s):
     return hashlib.sha256(s).digest()
