Skip to content

Commit a803d18

Browse files
authored
The chia.protocols module no longer depends upon chia.server. (#19636)
<!-- Merging Requirements: - Please give your PR a title that is release-note friendly - In order to be merged, you must add the most appropriate category Label (Added, Changed, Fixed) to your PR --> <!-- Explain why this is an improvement (Does this add missing functionality, improve performance, or reduce complexity?) --> The modules `chia.protocols` and `chia.server` form a dependency loop. This change at least removes the direct dependency of `chia.protocols` on `chia.server`. ### Purpose: <!-- Does this PR introduce a breaking change? --> ### Current Behavior: ### New Behavior: <!-- As we aim for complete code coverage, please include details regarding unit, and regression tests --> ### Testing Notes: <!-- Attach any visual examples, or supporting evidence (attach any .gif/video/console output below) -->
1 parent c0410e9 commit a803d18

File tree

78 files changed

+78
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+78
-78
lines changed

chia/_tests/cmds/wallet/test_wallet.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
get_bytes32,
2626
)
2727
from chia.cmds.cmds_util import TransactionBundle
28+
from chia.protocols.outbound_message import NodeType
2829
from chia.rpc.wallet_request_types import (
2930
CancelOfferResponse,
3031
CATSpendResponse,
@@ -33,7 +34,6 @@
3334
SendTransactionResponse,
3435
TakeOfferResponse,
3536
)
36-
from chia.server.outbound_message import NodeType
3737
from chia.types.blockchain_format.program import Program
3838
from chia.types.signing_mode import SigningMode
3939
from chia.util.bech32m import encode_puzzle_hash

chia/_tests/connection_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
from chia._tests.util.time_out_assert import time_out_assert
1515
from chia.apis import ApiProtocolRegistry
16+
from chia.protocols.outbound_message import NodeType
1617
from chia.protocols.shared_protocol import default_capabilities
17-
from chia.server.outbound_message import NodeType
1818
from chia.server.server import ChiaServer, ssl_context_for_client
1919
from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
2020
from chia.server.ws_connection import WSChiaConnection

chia/_tests/core/farmer/test_farmer_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
)
1818
from chia.farmer.farmer_api import FarmerAPI
1919
from chia.protocols import farmer_protocol
20+
from chia.protocols.outbound_message import Message, NodeType
2021
from chia.protocols.protocol_message_types import ProtocolMessageTypes
21-
from chia.server.outbound_message import Message, NodeType
2222
from chia.util.hash import std_hash
2323
from chia.util.task_referencer import create_referenced_task
2424

chia/_tests/core/full_node/test_full_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
from chia.protocols import full_node_protocol as fnp
5656
from chia.protocols.farmer_protocol import DeclareProofOfSpace
5757
from chia.protocols.full_node_protocol import NewTransaction, RespondTransaction
58+
from chia.protocols.outbound_message import Message, NodeType
5859
from chia.protocols.protocol_message_types import ProtocolMessageTypes
5960
from chia.protocols.shared_protocol import Capability, default_capabilities
6061
from chia.protocols.wallet_protocol import SendTransaction, TransactionAck
6162
from chia.server.address_manager import AddressManager
6263
from chia.server.node_discovery import FullNodePeers
63-
from chia.server.outbound_message import Message, NodeType
6464
from chia.server.server import ChiaServer
6565
from chia.server.ws_connection import WSChiaConnection
6666
from chia.simulator.add_blocks_in_batches import add_blocks_in_batches

chia/_tests/core/mempool/test_mempool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
from chia.full_node.mempool_manager import MEMPOOL_MIN_FEE_INCREASE, LineageInfoCache
5252
from chia.full_node.pending_tx_cache import ConflictTxCache, PendingTxCache
5353
from chia.protocols import full_node_protocol, wallet_protocol
54+
from chia.protocols.outbound_message import Message
5455
from chia.protocols.wallet_protocol import TransactionAck
5556
from chia.server.api_protocol import ApiMetadata
56-
from chia.server.outbound_message import Message
5757
from chia.server.server import ChiaServer
5858
from chia.server.ws_connection import WSChiaConnection
5959
from chia.simulator.add_blocks_in_batches import add_blocks_in_batches

chia/_tests/core/server/test_dos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import chia.server.server
1414
from chia._tests.util.time_out_assert import time_out_assert
1515
from chia.protocols import full_node_protocol
16+
from chia.protocols.outbound_message import Message, make_msg
1617
from chia.protocols.protocol_message_types import ProtocolMessageTypes
1718
from chia.protocols.shared_protocol import Capability, Handshake
18-
from chia.server.outbound_message import Message, make_msg
1919
from chia.server.rate_limits import RateLimiter
2020
from chia.server.server import ChiaServer
2121
from chia.server.ws_connection import WSChiaConnection

chia/_tests/core/server/test_rate_limits.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
from chia._tests.conftest import node_with_params
99
from chia._tests.util.time_out_assert import time_out_assert
1010
from chia.protocols.full_node_protocol import RejectBlock, RejectBlocks, RespondBlock, RespondBlocks
11+
from chia.protocols.outbound_message import make_msg
1112
from chia.protocols.protocol_message_types import ProtocolMessageTypes
1213
from chia.protocols.shared_protocol import Capability
13-
from chia.server.outbound_message import make_msg
1414
from chia.server.rate_limit_numbers import compose_rate_limits, get_rate_limits_to_use
1515
from chia.server.rate_limit_numbers import rate_limits as rl_numbers
1616
from chia.server.rate_limits import RateLimiter

chia/_tests/core/server/test_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
from chia._tests.util.time_out_assert import time_out_assert
1616
from chia.full_node.full_node_api import FullNodeAPI
1717
from chia.protocols.full_node_protocol import RejectBlock, RequestBlock, RequestTransaction
18+
from chia.protocols.outbound_message import NodeType, make_msg
1819
from chia.protocols.protocol_message_types import ProtocolMessageTypes
1920
from chia.protocols.shared_protocol import Error, protocol_version
2021
from chia.protocols.wallet_protocol import RejectHeaderRequest
2122
from chia.server.api_protocol import ApiMetadata
22-
from chia.server.outbound_message import NodeType, make_msg
2323
from chia.server.server import ChiaServer
2424
from chia.server.start_full_node import create_full_node_service
2525
from chia.server.start_wallet import create_wallet_service

chia/_tests/core/ssl/test_ssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from chia_rs.sized_bytes import bytes32
1111

1212
from chia.apis import ApiProtocolRegistry
13+
from chia.protocols.outbound_message import NodeType
1314
from chia.protocols.shared_protocol import default_capabilities
14-
from chia.server.outbound_message import NodeType
1515
from chia.server.server import ChiaServer, ssl_context_for_client
1616
from chia.server.ssl_context import chia_ssl_ca_paths, private_ssl_ca_paths
1717
from chia.server.ws_connection import WSChiaConnection

chia/_tests/core/test_crawler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
from chia._tests.util.time_out_assert import time_out_assert
1414
from chia.full_node.full_node_api import FullNodeAPI
1515
from chia.protocols.full_node_protocol import NewPeak
16+
from chia.protocols.outbound_message import make_msg
1617
from chia.protocols.protocol_message_types import ProtocolMessageTypes
1718
from chia.protocols.wallet_protocol import RequestChildren
1819
from chia.seeder.peer_record import PeerRecord, PeerReliability
1920
from chia.server.aliases import CrawlerService
20-
from chia.server.outbound_message import make_msg
2121
from chia.types.peer_info import PeerInfo
2222

2323

0 commit comments

Comments
 (0)