Merge b33c03b into merged_master (Bitcoin PR #17124)

apoelstra · apoelstra · commit fc7646d433a9 · 2020-11-09T03:58:55.000Z
diff --git a/test/functional/wallet_address_types.py b/test/functional/wallet_address_types.py
@@ -80,6 +80,9 @@ def set_test_params(self):
             ["-changetype=p2sh-segwit"],
             [],
         ]
+        # whitelist all peers to speed up tx relay / mempool sync
+        for args in self.extra_args:
+            args.append("-whitelist=127.0.0.1")
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ def set_test_params(self):`
`80`	`80`	`["-changetype=p2sh-segwit"],`
`81`	`81`	`[],`
`82`	`82`	`]`
	`83`	`+ # whitelist all peers to speed up tx relay / mempool sync`
	`84`	`+ for args in self.extra_args:`
	`85`	`+ args.append("-whitelist=127.0.0.1")`
`83`	`86`
`84`	`87`	`def skip_test_if_missing_module(self):`
`85`	`88`	`self.skip_if_no_wallet()`