[tests] Rename p2p_* functional tests.

15 files changed, 16 insertions, 16 deletions

diff --git a/test/functional/README.md b/test/functional/README.md
index b3d34c72fd..662b4b44d5 100644
--- a/test/functional/README.md
+++ b/test/functional/README.md
@@ -87,7 +87,7 @@ start the networking thread.  (Continue with the test logic in your existing
 thread.)
 
 - Can be used to write tests where specific P2P protocol behavior is tested.
-Examples tests are `p2p-acceptblock.py`, `p2p-compactblocks.py`.
+Examples tests are `p2p_unrequested_blocks.py`, `p2p_compactblocks.py`.
 
 #### Comptool
 
@@ -133,7 +133,7 @@ Each `TestInstance` consists of:
     acceptance is tested against the given outcome.
 
 - For examples of tests written in this framework, see
-  `invalidblockrequest.py` and `feature_block.py`.
+  `p2p_invalid_block.py` and `feature_block.py`.
 
 ### test-framework modules
 
diff --git a/test/functional/p2p-compactblocks.py b/test/functional/p2p_compactblocks.py
index d9f461a049..d9f461a049 100755
--- a/test/functional/p2p-compactblocks.py
+++ b/test/functional/p2p_compactblocks.py
diff --git a/test/functional/disconnect_ban.py b/test/functional/p2p_disconnect_ban.py
index c6067befb2..c6067befb2 100755
--- a/test/functional/disconnect_ban.py
+++ b/test/functional/p2p_disconnect_ban.py
diff --git a/test/functional/p2p-feefilter.py b/test/functional/p2p_feefilter.py
index 47d9c55160..47d9c55160 100755
--- a/test/functional/p2p-feefilter.py
+++ b/test/functional/p2p_feefilter.py
diff --git a/test/functional/p2p-fingerprint.py b/test/functional/p2p_fingerprint.py
index 93ef73e25e..93ef73e25e 100755
--- a/test/functional/p2p-fingerprint.py
+++ b/test/functional/p2p_fingerprint.py
diff --git a/test/functional/invalidblockrequest.py b/test/functional/p2p_invalid_block.py
index edcade63c1..edcade63c1 100755
--- a/test/functional/invalidblockrequest.py
+++ b/test/functional/p2p_invalid_block.py
diff --git a/test/functional/invalidtxrequest.py b/test/functional/p2p_invalid_tx.py
index 9c1100e070..9c1100e070 100755
--- a/test/functional/invalidtxrequest.py
+++ b/test/functional/p2p_invalid_tx.py
diff --git a/test/functional/p2p-leaktests.py b/test/functional/p2p_leak.py
index ce4e6e9144..ce4e6e9144 100755
--- a/test/functional/p2p-leaktests.py
+++ b/test/functional/p2p_leak.py
diff --git a/test/functional/p2p-mempool.py b/test/functional/p2p_mempool.py
index 485a8af3d0..485a8af3d0 100755
--- a/test/functional/p2p-mempool.py
+++ b/test/functional/p2p_mempool.py
diff --git a/test/functional/node_network_limited.py b/test/functional/p2p_node_network_limited.py
index 70415e0168..70415e0168 100755
--- a/test/functional/node_network_limited.py
+++ b/test/functional/p2p_node_network_limited.py
diff --git a/test/functional/p2p-segwit.py b/test/functional/p2p_segwit.py
index 20e4805df0..20e4805df0 100755
--- a/test/functional/p2p-segwit.py
+++ b/test/functional/p2p_segwit.py
diff --git a/test/functional/sendheaders.py b/test/functional/p2p_sendheaders.py
index 8869aeaaea..8869aeaaea 100755
--- a/test/functional/sendheaders.py
+++ b/test/functional/p2p_sendheaders.py
diff --git a/test/functional/p2p-timeouts.py b/test/functional/p2p_timeouts.py
index 6d21095cc6..6d21095cc6 100755
--- a/test/functional/p2p-timeouts.py
+++ b/test/functional/p2p_timeouts.py
diff --git a/test/functional/p2p-acceptblock.py b/test/functional/p2p_unrequested_blocks.py
index 672626f15b..672626f15b 100755
--- a/test/functional/p2p-acceptblock.py
+++ b/test/functional/p2p_unrequested_blocks.py
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index edc1fed8cb..26beef5a52 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -60,16 +60,16 @@ BASE_SCRIPTS= [
     # vv Tests less than 5m vv
     'feature_block.py',
     'fundrawtransaction.py',
-    'p2p-compactblocks.py',
+    'p2p_compactblocks.py',
     'feature_segwit.py',
     # vv Tests less than 2m vv
     'wallet_basic.py',
     'wallet_accounts.py',
-    'p2p-segwit.py',
+    'p2p_segwit.py',
     'wallet_dump.py',
     'listtransactions.py',
     # vv Tests less than 60s vv
-    'sendheaders.py',
+    'p2p_sendheaders.py',
     'wallet_zapwallettxes.py',
     'wallet_importmulti.py',
     'mempool_limit.py',
@@ -99,17 +99,17 @@ BASE_SCRIPTS= [
     'multi_rpc.py',
     'feature_proxy.py',
     'signrawtransactions.py',
-    'disconnect_ban.py',
+    'p2p_disconnect_ban.py',
     'decodescript.py',
     'blockchain.py',
     'deprecated_rpc.py',
     'wallet_disable.py',
     'net.py',
     'wallet_keypool.py',
-    'p2p-mempool.py',
+    'p2p_mempool.py',
     'prioritise_transaction.py',
-    'invalidblockrequest.py',
-    'invalidtxrequest.py',
+    'p2p_invalid_block.py',
+    'p2p_invalid_tx.py',
     'feature_versionbits_warning.py',
     'preciousblock.py',
     'wallet_importprunedfunds.py',
@@ -120,18 +120,18 @@ BASE_SCRIPTS= [
     'wallet_bumpfee.py',
     'rpcnamedargs.py',
     'wallet_listsinceblock.py',
-    'p2p-leaktests.py',
+    'p2p_leak.py',
     'wallet_encryption.py',
     'feature_dersig.py',
     'feature_cltv.py',
     'uptime.py',
     'wallet_resendwallettransactions.py',
     'feature_minchainwork.py',
-    'p2p-fingerprint.py',
+    'p2p_fingerprint.py',
     'feature_uacomment.py',
-    'p2p-acceptblock.py',
+    'p2p_unrequested_blocks.py',
     'feature_logging.py',
-    'node_network_limited.py',
+    'p2p_node_network_limited.py',
     'feature_config_args.py',
     # Don't append tests at the end to avoid merge conflicts
     # Put them in a random line within the section that fits their approximate run-time
@@ -150,10 +150,10 @@ EXTENDED_SCRIPTS = [
     # vv Tests less than 2m vv
     'feature_bip68_sequence.py',
     'getblocktemplate_longpoll.py',
-    'p2p-timeouts.py',
+    'p2p_timeouts.py',
     # vv Tests less than 60s vv
     'feature_bip9_softforks.py',
-    'p2p-feefilter.py',
+    'p2p_feefilter.py',
     'rpcbind_test.py',
     # vv Tests less than 30s vv
     'feature_assumevalid.py',
@@ -474,7 +474,7 @@ class TestResult():
 def check_script_prefixes():
     """Check that no more than `EXPECTED_VIOLATION_COUNT` of the
        test scripts don't start with one of the allowed name prefixes."""
-    EXPECTED_VIOLATION_COUNT = 37
+    EXPECTED_VIOLATION_COUNT = 24
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming