chia-blockchain 2.5.4rc2__py3-none-any.whl → 2.5.5__py3-none-any.whl

chia/_tests/plot_sync/test_sender.py

@@ -12,8 +12,8 @@ from chia.plot_sync.sender import ExpectedResponse, Sender
 from chia.plot_sync.util import Constants
 from chia.plotting.util import HarvestingMode
 from chia.protocols.harvester_protocol import PlotSyncIdentifier, PlotSyncResponse
+from chia.protocols.outbound_message import NodeType
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.outbound_message import NodeType
 from chia.simulator.block_tools import BlockTools
 
 

chia/_tests/plot_sync/test_sync_simulated.py

@@ -27,11 +27,11 @@ from chia.plot_sync.util import Constants
 from chia.plotting.manager import PlotManager
 from chia.plotting.util import PlotInfo
 from chia.protocols.harvester_protocol import PlotSyncError, PlotSyncResponse
+from chia.protocols.outbound_message import make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
-from chia.server.outbound_message import make_msg
+from chia.server.aliases import FarmerService, HarvesterService
 from chia.server.ws_connection import WSChiaConnection
 from chia.simulator.block_tools import BlockTools
-from chia.types.aliases import FarmerService, HarvesterService
 from chia.util.batches import to_batches
 
 log = logging.getLogger(__name__)
@@ -291,7 +291,7 @@ def create_example_plots(count: int, seeded_random: random.Random) -> list[PlotI
             file_size=uint64(0),
             time_modified=time.time(),
         )
-        for x in range(0, count)
+        for x in range(count)
     ]
 
 

chia/_tests/plot_sync/util.py

@@ -14,8 +14,8 @@ from chia._tests.util.time_out_assert import time_out_assert
 from chia.harvester.harvester import Harvester
 from chia.plot_sync.sender import Sender
 from chia.protocols.harvester_protocol import PlotSyncIdentifier
-from chia.server.outbound_message import Message, NodeType
-from chia.types.aliases import FarmerService, HarvesterService
+from chia.protocols.outbound_message import Message, NodeType
+from chia.server.aliases import FarmerService, HarvesterService
 from chia.types.peer_info import PeerInfo, UnresolvedPeerInfo
 
 

chia/_tests/pools/test_pool_cmdline.py

@@ -5,10 +5,11 @@ from dataclasses import dataclass
 from io import StringIO
 from typing import Optional, cast
 
+import click
 import pytest
 from chia_rs import G1Element
 from chia_rs.sized_bytes import bytes32
-from chia_rs.sized_ints import uint64
+from chia_rs.sized_ints import uint32, uint64
 
 # TODO: update after resolution in https://github.com/pytest-dev/pytest/issues/7469
 from pytest_mock import MockerFixture
@@ -37,14 +38,16 @@ from chia.cmds.plotnft import (
     ShowPlotNFTCMD,
 )
 from chia.pools.pool_config import PoolWalletConfig, load_pool_config, update_pool_config
-from chia.pools.pool_wallet_info import PoolSingletonState, PoolWalletInfo
-from chia.rpc.wallet_rpc_client import WalletRpcClient
+from chia.pools.pool_wallet_info import PoolSingletonState
 from chia.simulator.setup_services import setup_farmer
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.config import lock_and_load_config, save_config
 from chia.util.errors import CliRpcConnectionError
 from chia.wallet.util.address_type import AddressType
+from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import WalletType
+from chia.wallet.wallet_request_types import PWStatus
+from chia.wallet.wallet_rpc_client import WalletRpcClient
 from chia.wallet.wallet_state_manager import WalletStateManager
 
 # limit to plain consensus mode for all tests
@@ -322,7 +325,7 @@ async def test_plotnft_cli_show_with_farmer(
         assert "Current state" not in out
 
         wallet_id = await create_new_plotnft(wallet_environments)
-        pw_info, _ = await wallet_rpc.pw_status(wallet_id)
+        pw_info = (await wallet_rpc.pw_status(PWStatus(uint32(wallet_id)))).state
 
         await ShowPlotNFTCMD(
             context=ChiaCliContext(root_path=root_path),
@@ -480,6 +483,17 @@ async def test_plotnft_cli_join(
     # Create a farming plotnft to url http://pool.example.com
     wallet_id = await create_new_plotnft(wallet_environments)
 
+    # Test joining the same pool again
+    with pytest.raises(click.ClickException, match="already farming to pool http://pool.example.com"):
+        await JoinPlotNFTCMD(
+            rpc_info=NeedsWalletRPC(
+                client_info=client_info,
+            ),
+            id=wallet_id,
+            pool_url="http://pool.example.com",
+            dont_prompt=not prompt,
+        ).run()
+
     # HTTPS check on mainnet
     with pytest.raises(CliRpcConnectionError, match="must be HTTPS on mainnet"):
         config_override = wallet_state_manager.config.copy()
@@ -617,18 +631,6 @@ async def test_plotnft_cli_join(
     )
     await verify_pool_state(wallet_rpc, wallet_id, PoolSingletonState.FARMING_TO_POOL)
 
-    # Join the same pool test - code not ready yet for test
-    # Needs PR #18822
-    # with pytest.raises(CliRpcConnectionError, match="already joined"):
-    #     await JoinPlotNFTCMD(
-    #         rpc_info=NeedsWalletRPC(
-    #             client_info=client_info,
-    #         ),
-    #         id=wallet_id,
-    #         pool_url="http://127.0.0.1",
-    #         dont_prompt=not prompt,
-    #     ).run()
-
 
 @pytest.mark.parametrize(
     "wallet_environments",
@@ -677,8 +679,9 @@ async def test_plotnft_cli_claim(
     # Create a self-pooling plotnft
     wallet_id = await create_new_plotnft(wallet_environments, self_pool=True)
 
-    status: PoolWalletInfo = (await wallet_rpc.pw_status(wallet_id))[0]
-    our_ph = await wallet_state_manager.main_wallet.get_new_puzzlehash()
+    status = (await wallet_rpc.pw_status(PWStatus(uint32(wallet_id)))).state
+    async with wallet_state_manager.new_action_scope(DEFAULT_TX_CONFIG, push=True) as action_scope:
+        our_ph = await action_scope.get_puzzle_hash(wallet_state_manager)
     bt = wallet_environments.full_node.bt
 
     async with manage_temporary_pool_plot(bt, status.p2_singleton_puzzle_hash) as pool_plot:
@@ -808,7 +811,7 @@ async def test_plotnft_cli_inspect(
 
     assert (
         json_output["pool_wallet_info"]["current"]["owner_pubkey"]
-        == "0xb286bbf7a10fa058d2a2a758921377ef00bb7f8143e1bd40dd195ae918dbef42cfc481140f01b9eae13b430a0c8fe304"
+        == "0x880afd6f9e123005655376e389015877e60060b768592809d2c746325d256edeb0017e1b406cba0832aa983e5c4bbf54"
     )
     assert json_output["pool_wallet_info"]["current"]["state"] == PoolSingletonState.FARMING_TO_POOL.value
 
@@ -833,7 +836,7 @@ async def test_plotnft_cli_inspect(
 
     assert (
         json_output["pool_wallet_info"]["current"]["owner_pubkey"]
-        == "0x893474c97d04a0283483ba1af9e070768dff9e9a83d9ae2cf00a34be96ca29aec387dfb7474f2548d777000e5463f602"
+        == "0xb286bbf7a10fa058d2a2a758921377ef00bb7f8143e1bd40dd195ae918dbef42cfc481140f01b9eae13b430a0c8fe304"
     )
 
     assert json_output["pool_wallet_info"]["current"]["state"] == PoolSingletonState.SELF_POOLING.value
@@ -874,7 +877,7 @@ async def test_plotnft_cli_change_payout(
     root_path = wallet_environments.environments[0].node.root_path
 
     wallet_id = await create_new_plotnft(wallet_environments)
-    pw_info, _ = await wallet_rpc.pw_status(wallet_id)
+    pw_info = (await wallet_rpc.pw_status(PWStatus(uint32(wallet_id)))).state
 
     # This tests what happens when using None for root_path
     mocker.patch("chia.cmds.plotnft_funcs.DEFAULT_ROOT_PATH", root_path)
@@ -999,3 +1002,27 @@ async def test_plotnft_cli_misc(mocker: MockerFixture, consensus_mode: Consensus
             fee=uint64(0),
             prompt=False,
         )
+
+
+@pytest.mark.anyio
+async def test_plotnft_unsynced_joining(mocker: MockerFixture, consensus_mode: ConsensusMode) -> None:
+    from chia.cmds.plotnft_funcs import join_pool
+    from chia.wallet.wallet_request_types import GetSyncStatusResponse
+
+    test_rpc_client = TestWalletRpcClient()
+
+    mock = mocker.patch.object(test_rpc_client, "get_sync_status")
+    mock.return_value = GetSyncStatusResponse(synced=False, syncing=True)
+
+    with pytest.raises(click.ClickException, match="Wallet must be synced before joining a pool"):
+        await join_pool(
+            wallet_info=WalletClientInfo(
+                client=cast(WalletRpcClient, test_rpc_client),
+                fingerprint=0,
+                config={"selected_network": "mainnet"},
+            ),
+            pool_url="http://pool.example.com",
+            fee=uint64(0),
+            prompt=False,
+            wallet_id=None,
+        )

chia/_tests/pools/test_pool_puzzles_lifecycle.py

@@ -4,7 +4,7 @@ import copy
 from unittest import TestCase
 
 import pytest
-from chia_rs import AugSchemeMPL, G1Element, G2Element, PrivateKey
+from chia_rs import AugSchemeMPL, CoinSpend, G1Element, G2Element, PrivateKey, SpendBundle
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32, uint64
 
@@ -30,8 +30,7 @@ from chia.pools.pool_puzzles import (
 from chia.pools.pool_wallet_info import PoolState
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
-from chia.types.coin_spend import CoinSpend, make_spend
-from chia.types.spend_bundle import SpendBundle
+from chia.types.coin_spend import make_spend
 from chia.wallet.puzzles import singleton_top_layer
 from chia.wallet.puzzles.p2_conditions import puzzle_for_conditions
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import (