fix tests

Author: Quexington

chia/wallet/util/tx_config.py

@@ -88,7 +88,7 @@ def autofill(
 
     @classmethod
     def from_json_dict(cls, json_dict: dict[str, Any]) -> Self:
-        if "excluded_coins" in json_dict:
+        if "excluded_coins" in json_dict and json_dict["excluded_coins"] is not None:
             excluded_coins: list[Coin] = [Coin.from_json_dict(c) for c in json_dict["excluded_coins"]]
             excluded_coin_ids: list[str] = [c.name().hex() for c in excluded_coins]
             if "excluded_coin_ids" in json_dict:

chia/wallet/wallet_request_types.py

@@ -485,16 +485,13 @@ class DeleteUnconfirmedTransactions(Streamable):
 class SelectCoins(CoinSelectionConfigLoader):
     wallet_id: uint32 = field(default_factory=default_raise)
     amount: uint64 = field(default_factory=default_raise)
-    excluded_coins: Optional[list[Coin]] = None
-    exclude_coins: Optional[list[Coin]] = None
+    exclude_coins: Optional[list[Coin]] = None  # for backwards compatibility
 
     def __post_init__(self) -> None:
-        if self.excluded_coin_ids is not None and (self.excluded_coins is not None or self.exclude_coins is not None):
+        if self.excluded_coin_ids is not None and self.exclude_coins is not None:
             raise ValueError(
-                "Cannot specify both excluded_coin_ids and exclude(d)_coins (the latter arguments are deprecated)"
+                "Cannot specify both excluded_coin_ids/excluded_coins and exclude_coins (the latter is deprecated)"
             )
-        elif self.excluded_coins is not None and self.exclude_coins is not None:
-            raise ValueError("Cannot specify both excluded_coins and exclude_coins (both are deprecated)")
         super().__post_init__()
 
     @classmethod

chia/wallet/wallet_rpc_api.py

@@ -1739,13 +1739,10 @@ async def select_coins(
 
         # Some backwards compat fill-ins
         if request.excluded_coin_ids is None:
-            if request.excluded_coins is not None:
-                request = request.override(
-                    excluded_coin_ids=[c.name() for c in request.excluded_coins],
-                )
-            elif request.exclude_coins is not None:
+            if request.exclude_coins is not None:
                 request = request.override(
                     excluded_coin_ids=[c.name() for c in request.exclude_coins],
+                    exclude_coins=None,
                 )
 
         # don't love this snippet of code
@@ -1754,7 +1751,7 @@ async def select_coins(
         tx_config = DEFAULT_TX_CONFIG.override(
             **request.autofill(
                 constants=self.service.wallet_state_manager.constants,
-            ).to_json_dict()
+            ).__dict__
         )
 
         if await self.service.wallet_state_manager.synced() is False: