Skip to content

[CHIA-3390] Port remaining test_trades.py tests to parametrized with R-CATs #19831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 5, 2025
Merged

[CHIA-3390] Port remaining test_trades.py tests to parametrized with R-CATs #19831

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6435f19
Port `test_trade_cancellation`
Quexington Jul 16, 2025
d4332e9
Port `test_trade_conflict`
Quexington Jul 16, 2025
d8693da
Port `test_trade_bad_spend`
Quexington Jul 16, 2025
123806c
Port `test_trade_high_fee`
Quexington Jul 16, 2025
57682ac
Port `test_aggregated_trade_state`
Quexington Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 55 additions & 55 deletions chia/_tests/wallet/cat_wallet/test_trades.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,8 +1629,9 @@ async def assert_trade_tx_number(wallet_node: WalletNode, trade_id: bytes32, num
indirect=True,
)
@pytest.mark.limit_consensus_modes(reason="irrelevant")
@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
@pytest.mark.anyio
async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> None:
async def test_trade_cancellation(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
env_maker = wallet_environments.environments[0]
env_taker = wallet_environments.environments[1]

Expand All @@ -1645,16 +1646,15 @@ async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> N

xch_to_cat_amount = uint64(100)

async with env_maker.wallet_state_manager.new_action_scope(
wallet_environments.tx_config, push=True
) as action_scope:
cat_wallet_maker = await CATWallet.create_new_cat_wallet(
env_maker.wallet_state_manager,
env_maker.xch_wallet,
{"identifier": "genesis_by_id"},
xch_to_cat_amount,
action_scope,
)
cat_wallet_maker = await mint_cat(
wallet_environments,
env_maker,
"xch",
"cat",
xch_to_cat_amount,
wallet_type,
"cat",
)

await wallet_environments.process_pending_states(
[
Expand Down Expand Up @@ -1941,8 +1941,9 @@ async def test_trade_cancellation(wallet_environments: WalletTestFramework) -> N
indirect=True,
)
@pytest.mark.limit_consensus_modes(reason="irrelevant")
@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
@pytest.mark.anyio
async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
async def test_trade_conflict(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
env_maker = wallet_environments.environments[0]
env_taker = wallet_environments.environments[1]
env_trader = wallet_environments.environments[2]
Expand All @@ -1963,16 +1964,15 @@ async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
xch_to_cat_amount = uint64(100)
fee = uint64(10)

async with env_maker.wallet_state_manager.new_action_scope(
wallet_environments.tx_config, push=True
) as action_scope:
await CATWallet.create_new_cat_wallet(
env_maker.wallet_state_manager,
env_maker.xch_wallet,
{"identifier": "genesis_by_id"},
xch_to_cat_amount,
action_scope,
)
await mint_cat(
wallet_environments,
env_maker,
"xch",
"cat",
xch_to_cat_amount,
wallet_type,
"cat",
)

await wallet_environments.process_pending_states(
[
Expand Down Expand Up @@ -2138,8 +2138,9 @@ async def test_trade_conflict(wallet_environments: WalletTestFramework) -> None:
indirect=True,
)
@pytest.mark.limit_consensus_modes(reason="irrelevant")
@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
@pytest.mark.anyio
async def test_trade_bad_spend(wallet_environments: WalletTestFramework) -> None:
async def test_trade_bad_spend(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
env_maker = wallet_environments.environments[0]
env_taker = wallet_environments.environments[1]

Expand All @@ -2154,16 +2155,15 @@ async def test_trade_bad_spend(wallet_environments: WalletTestFramework) -> None

xch_to_cat_amount = uint64(100)

async with env_maker.wallet_state_manager.new_action_scope(
wallet_environments.tx_config, push=True
) as action_scope:
await CATWallet.create_new_cat_wallet(
env_maker.wallet_state_manager,
env_maker.xch_wallet,
{"identifier": "genesis_by_id"},
xch_to_cat_amount,
action_scope,
)
await mint_cat(
wallet_environments,
env_maker,
"xch",
"cat",
xch_to_cat_amount,
wallet_type,
"cat",
)

await wallet_environments.process_pending_states(
[
Expand Down Expand Up @@ -2260,8 +2260,9 @@ def check_wallet_cache_empty() -> bool:
indirect=True,
)
@pytest.mark.limit_consensus_modes(reason="irrelevant")
@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
@pytest.mark.anyio
async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:
async def test_trade_high_fee(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
env_maker = wallet_environments.environments[0]
env_taker = wallet_environments.environments[1]

Expand All @@ -2276,16 +2277,15 @@ async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:

xch_to_cat_amount = uint64(100)

async with env_maker.wallet_state_manager.new_action_scope(
wallet_environments.tx_config, push=True
) as action_scope:
await CATWallet.create_new_cat_wallet(
env_maker.wallet_state_manager,
env_maker.xch_wallet,
{"identifier": "genesis_by_id"},
xch_to_cat_amount,
action_scope,
)
await mint_cat(
wallet_environments,
env_maker,
"xch",
"cat",
xch_to_cat_amount,
wallet_type,
"cat",
)

await wallet_environments.process_pending_states(
[
Expand Down Expand Up @@ -2405,8 +2405,9 @@ async def test_trade_high_fee(wallet_environments: WalletTestFramework) -> None:
indirect=True,
)
@pytest.mark.limit_consensus_modes(reason="irrelevant")
@pytest.mark.parametrize("wallet_type", [CATWallet, RCATWallet])
@pytest.mark.anyio
async def test_aggregated_trade_state(wallet_environments: WalletTestFramework) -> None:
async def test_aggregated_trade_state(wallet_environments: WalletTestFramework, wallet_type: type[CATWallet]) -> None:
env_maker = wallet_environments.environments[0]
env_taker = wallet_environments.environments[1]

Expand All @@ -2421,16 +2422,15 @@ async def test_aggregated_trade_state(wallet_environments: WalletTestFramework)

xch_to_cat_amount = uint64(100)

async with env_maker.wallet_state_manager.new_action_scope(
wallet_environments.tx_config, push=True
) as action_scope:
await CATWallet.create_new_cat_wallet(
env_maker.wallet_state_manager,
env_maker.xch_wallet,
{"identifier": "genesis_by_id"},
xch_to_cat_amount,
action_scope,
)
await mint_cat(
wallet_environments,
env_maker,
"xch",
"cat",
xch_to_cat_amount,
wallet_type,
"cat",
)

await wallet_environments.process_pending_states(
[
Expand Down
Loading