Undo UserFriendlyMemos

Author: Quexington

chia/_tests/cmds/cmd_test_utils.py

@@ -44,7 +44,6 @@
     NFTGetInfo,
     NFTGetInfoResponse,
     SendTransactionMultiResponse,
-    UserFriendlyMemos,
     UserFriendlyTransactionRecord,
     WalletInfoResponse,
 )
@@ -138,7 +137,7 @@ async def get_transaction(self, request: GetTransaction) -> GetTransactionRespon
                 trade_id=None,
                 type=uint32(TransactionType.OUTGOING_TX.value),
                 name=bytes32([2] * 32),
-                memos=UserFriendlyMemos([(bytes32([3] * 32), [bytes([4] * 32)])]),
+                memos={bytes32([3] * 32): [bytes([4] * 32)]},
                 valid_times=ConditionValidTimes(),
                 to_address="",
             ),

chia/_tests/cmds/wallet/test_wallet.py

@@ -60,7 +60,6 @@
     RoyaltyAsset,
     SendTransactionResponse,
     TakeOfferResponse,
-    UserFriendlyMemos,
     UserFriendlyTransactionRecordWithMetadata,
     WalletInfoResponse,
 )
@@ -140,7 +139,7 @@ async def get_transactions(self, request: GetTransactions) -> GetTransactionsRes
                     trade_id=None,
                     type=uint32(t_type.value),
                     name=bytes32([2 + i] * 32),
-                    memos=UserFriendlyMemos([(bytes32([3 + i] * 32), [bytes([4 + i] * 32)])]),
+                    memos={bytes32([3 + i] * 32): [bytes([4 + i] * 32)]},
                     valid_times=ConditionValidTimes(),
                     to_address="",
                 )

chia/wallet/wallet_request_types.py

@@ -47,48 +47,11 @@ def default_raise() -> Any:  # pragma: no cover
     raise RuntimeError("This should be impossible to hit and is just for < 3.10 compatibility")
 
 
-class UserFriendlyMemos:
-    unfriendly_memos: list[tuple[bytes32, list[bytes]]]
-
-    def __init__(self, unfriendly_memos: list[tuple[bytes32, list[bytes]]]) -> None:
-        self.unfriendly_memos = unfriendly_memos
-
-    def __eq__(self, other: object) -> bool:
-        if isinstance(other, UserFriendlyMemos) and other.unfriendly_memos == self.unfriendly_memos:
-            return True
-        else:
-            return False
-
-    def __bytes__(self) -> bytes:
-        raise NotImplementedError("Should not be serializing this object as bytes, it's only for RPC")
-
-    @classmethod
-    def parse(cls, f: BinaryIO) -> UserFriendlyMemos:
-        raise NotImplementedError("Should not be deserializing this object from a stream, it's only for RPC")
-
-    def to_json_dict(self) -> dict[str, Any]:
-        return {
-            "0x" + coin_id.hex(): "0x" + memo.hex()
-            for coin_id, memos in self.unfriendly_memos
-            for memo in memos
-            if memo is not None
-        }
-
-    @classmethod
-    def from_json_dict(cls, json_dict: dict[str, Any]) -> UserFriendlyMemos:
-        return UserFriendlyMemos(
-            [(bytes32.from_hexstr(coin_id), [hexstr_to_bytes(memo)]) for coin_id, memo in json_dict.items()]
-        )
-
-
 @streamable
 @dataclass(frozen=True)
 class UserFriendlyTransactionRecord(TransactionRecord):
     to_address: str
-    memos: UserFriendlyMemos  # type: ignore[assignment]
-
-    def get_memos(self) -> dict[bytes32, list[bytes]]:
-        return {coin_id: ms for coin_id, ms in self.memos.unfriendly_memos}
+    memos: dict[bytes32, list[bytes]]  # type: ignore[assignment]
 
     def to_transaction_record(self) -> TransactionRecord:
         return TransactionRecord.from_json_dict_convenience(self.to_json_dict())