scripted-diff: Rename mininode to p2p

jnewbery · jnewbery · commit 85165d4332b0 · 2020-08-21T15:52:20.000+01:00
-BEGIN VERIFY SCRIPT-
sed -i 's/\.mininode/\.p2p/g' $(git grep -l "mininode")
git mv test/functional/test_framework/mininode.py test/functional/test_framework/p2p.py
-END VERIFY SCRIPT-
diff --git a/test/functional/example_test.py b/test/functional/example_test.py
@@ -16,7 +16,7 @@
 # Avoid wildcard * imports
 from test_framework.blocktools import (create_block, create_coinbase)
 from test_framework.messages import CInv, MSG_BLOCK
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     p2p_lock,
     msg_block,
diff --git a/test/functional/feature_assumevalid.py b/test/functional/feature_assumevalid.py
@@ -42,7 +42,7 @@
     msg_block,
     msg_headers,
 )
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.script import (CScript, OP_TRUE)
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
@@ -26,7 +26,7 @@
     uint256_from_compact,
     uint256_from_str,
 )
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.script import (
     CScript,
     MAX_SCRIPT_ELEMENT_SIZE,
diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py
@@ -10,7 +10,7 @@
 
 from test_framework.blocktools import create_coinbase, create_block, create_transaction
 from test_framework.messages import CTransaction, msg_block, ToHex
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.script import CScript, OP_1NEGATE, OP_CHECKLOCKTIMEVERIFY, OP_DROP, CScriptNum
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
diff --git a/test/functional/feature_csv_activation.py b/test/functional/feature_csv_activation.py
@@ -44,7 +44,7 @@
 
 from test_framework.blocktools import create_coinbase, create_block, create_transaction
 from test_framework.messages import ToHex, CTransaction
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.script import (
     CScript,
     OP_CHECKSEQUENCEVERIFY,
diff --git a/test/functional/feature_dersig.py b/test/functional/feature_dersig.py
@@ -9,7 +9,7 @@
 
 from test_framework.blocktools import create_coinbase, create_block, create_transaction
 from test_framework.messages import msg_block
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.script import CScript
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py
@@ -14,7 +14,7 @@
 import time
 
 from test_framework.messages import CInv, MSG_BLOCK, msg_getdata
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, mine_large_block
 
diff --git a/test/functional/feature_versionbits_warning.py b/test/functional/feature_versionbits_warning.py
@@ -12,7 +12,7 @@
 
 from test_framework.blocktools import create_block, create_coinbase
 from test_framework.messages import msg_block
-from test_framework.mininode import P2PInterface, p2p_lock
+from test_framework.p2p import P2PInterface, p2p_lock
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import wait_until
 
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py
@@ -7,7 +7,7 @@
 from decimal import Decimal
 
 from test_framework.messages import COIN
-from test_framework.mininode import P2PTxInvStore
+from test_framework.p2p import P2PTxInvStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/mempool_persist.py b/test/functional/mempool_persist.py
@@ -40,7 +40,7 @@
 import time
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.mininode import P2PTxInvStore
+from test_framework.p2p import P2PTxInvStore
 from test_framework.util import (
     assert_equal,
     assert_greater_than_or_equal,
diff --git a/test/functional/mempool_unbroadcast.py b/test/functional/mempool_unbroadcast.py
@@ -7,7 +7,7 @@
 
 import time
 
-from test_framework.mininode import P2PTxInvStore
+from test_framework.p2p import P2PTxInvStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/mining_basic.py b/test/functional/mining_basic.py
@@ -20,7 +20,7 @@
     CBlockHeader,
     BLOCK_HEADER_SIZE,
 )
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
@@ -12,7 +12,7 @@
     NODE_WITNESS,
     msg_addr,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
 )
 from test_framework.test_framework import BitcoinTestFramework
diff --git a/test/functional/p2p_blockfilters.py b/test/functional/p2p_blockfilters.py
@@ -18,7 +18,7 @@
     ser_uint256,
     uint256_from_str,
 )
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_blocksonly.py b/test/functional/p2p_blocksonly.py
@@ -5,7 +5,7 @@
 """Test p2p blocksonly"""
 
 from test_framework.messages import msg_tx, CTransaction, FromHex
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
diff --git a/test/functional/p2p_compactblocks.py b/test/functional/p2p_compactblocks.py
@@ -11,7 +11,7 @@
 
 from test_framework.blocktools import create_block, create_coinbase, add_witness_commitment
 from test_framework.messages import BlockTransactions, BlockTransactionsRequest, calculate_shortid, CBlock, CBlockHeader, CInv, COutPoint, CTransaction, CTxIn, CTxInWitness, CTxOut, FromHex, HeaderAndShortIDs, msg_no_witness_block, msg_no_witness_blocktxn, msg_cmpctblock, msg_getblocktxn, msg_getdata, msg_getheaders, msg_headers, msg_inv, msg_sendcmpct, msg_sendheaders, msg_tx, msg_block, msg_blocktxn, MSG_BLOCK, MSG_CMPCT_BLOCK, MSG_WITNESS_FLAG, NODE_NETWORK, P2PHeaderAndShortIDs, PrefilledTransaction, ser_uint256, ToHex
-from test_framework.mininode import p2p_lock, P2PInterface
+from test_framework.p2p import p2p_lock, P2PInterface
 from test_framework.script import CScript, OP_TRUE, OP_DROP
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, wait_until, softfork_active
diff --git a/test/functional/p2p_dos_header_tree.py b/test/functional/p2p_dos_header_tree.py
@@ -8,7 +8,7 @@
     CBlockHeader,
     FromHex,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     msg_headers,
 )
diff --git a/test/functional/p2p_eviction.py b/test/functional/p2p_eviction.py
@@ -16,7 +16,7 @@
 import time
 
 from test_framework.test_framework import BitcoinTestFramework
-from test_framework.mininode import P2PInterface, P2PDataStore
+from test_framework.p2p import P2PInterface, P2PDataStore
 from test_framework.util import assert_equal, wait_until
 from test_framework.blocktools import create_block, create_coinbase
 from test_framework.messages import CTransaction, FromHex, msg_pong, msg_tx
diff --git a/test/functional/p2p_feefilter.py b/test/functional/p2p_feefilter.py
@@ -7,7 +7,7 @@
 from decimal import Decimal
 
 from test_framework.messages import MSG_TX, MSG_WTX, msg_feefilter
-from test_framework.mininode import p2p_lock, P2PInterface
+from test_framework.p2p import p2p_lock, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
diff --git a/test/functional/p2p_filter.py b/test/functional/p2p_filter.py
@@ -19,7 +19,7 @@
     msg_mempool,
     msg_version,
 )
-from test_framework.mininode import P2PInterface, p2p_lock
+from test_framework.p2p import P2PInterface, p2p_lock
 from test_framework.script import MAX_SCRIPT_ELEMENT_SIZE
 from test_framework.test_framework import BitcoinTestFramework
 
diff --git a/test/functional/p2p_fingerprint.py b/test/functional/p2p_fingerprint.py
@@ -12,7 +12,7 @@
 
 from test_framework.blocktools import (create_block, create_coinbase)
 from test_framework.messages import CInv, MSG_BLOCK
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     msg_headers,
     msg_block,
diff --git a/test/functional/p2p_getaddr_caching.py b/test/functional/p2p_getaddr_caching.py
@@ -12,7 +12,7 @@
     msg_addr,
     msg_getaddr,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     p2p_lock
 )
diff --git a/test/functional/p2p_getdata.py b/test/functional/p2p_getdata.py
@@ -9,7 +9,7 @@
     CInv,
     msg_getdata,
 )
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 
 
diff --git a/test/functional/p2p_invalid_block.py b/test/functional/p2p_invalid_block.py
@@ -14,7 +14,7 @@
 
 from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script
 from test_framework.messages import COIN
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
diff --git a/test/functional/p2p_invalid_locator.py b/test/functional/p2p_invalid_locator.py
@@ -6,7 +6,7 @@
 """
 
 from test_framework.messages import msg_getheaders, msg_getblocks, MAX_LOCATOR_SZ
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 
 
diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py
@@ -17,7 +17,7 @@
     MSG_TX,
     ser_string,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PDataStore,
     P2PInterface,
 )
diff --git a/test/functional/p2p_invalid_tx.py b/test/functional/p2p_invalid_tx.py
@@ -13,7 +13,7 @@
     CTxIn,
     CTxOut,
 )
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_leak.py b/test/functional/p2p_leak.py
@@ -17,7 +17,7 @@
     msg_ping,
     msg_version,
 )
-from test_framework.mininode import p2p_lock, P2PInterface
+from test_framework.p2p import p2p_lock, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_leak_tx.py b/test/functional/p2p_leak_tx.py
@@ -5,7 +5,7 @@
 """Test that we don't leak txs to inbound peers that we haven't yet announced to"""
 
 from test_framework.messages import msg_getdata, CInv, MSG_TX
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_nobloomfilter_messages.py b/test/functional/p2p_nobloomfilter_messages.py
@@ -12,7 +12,7 @@
 """
 
 from test_framework.messages import msg_mempool, msg_filteradd, msg_filterload, msg_filterclear
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
diff --git a/test/functional/p2p_node_network_limited.py b/test/functional/p2p_node_network_limited.py
@@ -9,7 +9,7 @@
     - send a block within 288 + 2 of the tip
     - disconnect peers who request blocks older than that."""
 from test_framework.messages import CInv, MSG_BLOCK, msg_getdata, msg_verack, NODE_NETWORK_LIMITED, NODE_WITNESS
-from test_framework.mininode import P2PInterface, p2p_lock
+from test_framework.p2p import P2PInterface, p2p_lock
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/p2p_permissions.py b/test/functional/p2p_permissions.py
@@ -13,7 +13,7 @@
     CTxInWitness,
     FromHex,
 )
-from test_framework.mininode import P2PDataStore
+from test_framework.p2p import P2PDataStore
 from test_framework.script import (
     CScript,
     OP_TRUE,
diff --git a/test/functional/p2p_ping.py b/test/functional/p2p_ping.py
@@ -8,7 +8,7 @@
 import time
 
 from test_framework.messages import msg_pong
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal
 
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
@@ -42,7 +42,7 @@
     uint256_from_str,
     FromHex,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     p2p_lock,
 )
diff --git a/test/functional/p2p_sendheaders.py b/test/functional/p2p_sendheaders.py
@@ -87,7 +87,7 @@
 """
 from test_framework.blocktools import create_block, create_coinbase
 from test_framework.messages import CInv
-from test_framework.mininode import (
+from test_framework.p2p import (
     CBlockHeader,
     NODE_WITNESS,
     P2PInterface,
diff --git a/test/functional/p2p_timeouts.py b/test/functional/p2p_timeouts.py
@@ -24,7 +24,7 @@
 from time import sleep
 
 from test_framework.messages import msg_ping
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 
 
diff --git a/test/functional/p2p_tx_download.py b/test/functional/p2p_tx_download.py
@@ -16,7 +16,7 @@
     msg_inv,
     msg_notfound,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
     p2p_lock,
 )
diff --git a/test/functional/p2p_unrequested_blocks.py b/test/functional/p2p_unrequested_blocks.py
@@ -55,7 +55,7 @@
 
 from test_framework.blocktools import create_block, create_coinbase, create_tx_with_script
 from test_framework.messages import CBlockHeader, CInv, MSG_BLOCK, msg_block, msg_headers, msg_inv
-from test_framework.mininode import p2p_lock, P2PInterface
+from test_framework.p2p import p2p_lock, P2PInterface
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
     assert_equal,
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -42,7 +42,7 @@
     FromHex,
     msg_block,
 )
-from test_framework.mininode import (
+from test_framework.p2p import (
     P2PInterface,
 )
 
diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py
@@ -19,7 +19,7 @@
     p2p_port,
     wait_until,
 )
-from test_framework.mininode import P2PInterface
+from test_framework.p2p import P2PInterface
 import test_framework.messages
 from test_framework.messages import (
     NODE_NETWORK,
diff --git a/test/functional/test_framework/p2p.py b/test/functional/test_framework/p2p.py
@@ -67,7 +67,7 @@
 )
 from test_framework.util import wait_until
 
-logger = logging.getLogger("TestFramework.mininode")
+logger = logging.getLogger("TestFramework.p2p")
 
 MESSAGEMAP = {
     b"addr": msg_addr,
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -21,7 +21,7 @@
 from .authproxy import JSONRPCException
 from . import coverage
 from .test_node import TestNode
-from .mininode import NetworkThread
+from .p2p import NetworkThread
 from .util import (
     MAX_NODES,
     PortSeed,
diff --git a/test/functional/wallet_resendwallettransactions.py b/test/functional/wallet_resendwallettransactions.py
@@ -7,7 +7,7 @@
 
 from test_framework.blocktools import create_block, create_coinbase
 from test_framework.messages import ToHex
-from test_framework.mininode import P2PTxInvStore, p2p_lock
+from test_framework.p2p import P2PTxInvStore, p2p_lock
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import assert_equal, wait_until
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`msg_block,`
`43`	`43`	`msg_headers,`
`44`	`44`	`)`
`45`		`-from test_framework.mininode import P2PInterface`
	`45`	`+from test_framework.p2p import P2PInterface`
`46`	`46`	`from test_framework.script import (CScript, OP_TRUE)`
`47`	`47`	`from test_framework.test_framework import BitcoinTestFramework`
`48`	`48`	`from test_framework.util import assert_equal`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`uint256_from_compact,`
`27`	`27`	`uint256_from_str,`
`28`	`28`	`)`
`29`		`-from test_framework.mininode import P2PDataStore`
	`29`	`+from test_framework.p2p import P2PDataStore`
`30`	`30`	`from test_framework.script import (`
`31`	`31`	`CScript,`
`32`	`32`	`MAX_SCRIPT_ELEMENT_SIZE,`