Skip to content

Commit 04a4a2a

Browse files
committed
Fix tests
1 parent abac7b9 commit 04a4a2a

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

chia/_tests/cmds/cmd_test_utils.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,17 @@ async def get_cat_name(self, wallet_id: int) -> str:
153153

154154
async def sign_message_by_address(self, request: SignMessageByAddress) -> SignMessageByAddressResponse:
155155
self.add_to_log("sign_message_by_address", (request.address, request.message))
156-
pubkey = G1Element.from_bytes(bytes([3] * 48))
157-
signature = G2Element.from_bytes(bytes([6] * 576))
156+
pubkey = G1Element.from_bytes(
157+
bytes.fromhex(
158+
"b5acf3599bc5fa5da1c00f6cc3d5bcf1560def67778b7f50a8c373a83f78761505b6250ab776e38a292e26628009aec4"
159+
)
160+
)
161+
signature = G2Element.from_bytes(
162+
bytes.fromhex(
163+
"c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
164+
"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
165+
)
166+
)
158167
signing_mode = SigningMode.CHIP_0002.value
159168
return SignMessageByAddressResponse(pubkey, signature, signing_mode)
160169

chia/_tests/cmds/wallet/test_wallet.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,9 @@ def test_sign_message(capsys: object, get_test_cli_clients: tuple[TestRpcClients
631631
# these are various things that should be in the output
632632
assert_list = [
633633
f"Message: {message.hex()}",
634-
f"Public Key: {bytes([3] * 48).hex()}",
635-
f"Signature: {bytes([6] * 576).hex()}",
634+
"Public Key: b5acf3599bc5fa5da1c00f6cc3d5bcf1560def67778b7f50a8c373a83f78761505b6250ab776e38a292e26628009aec4",
635+
"Signature: c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
636+
"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
636637
f"Signing Mode: {SigningMode.CHIP_0002.value}",
637638
]
638639
run_cli_command_and_assert(capsys, root_dir, [*command_args, f"-a{xch_addr}"], assert_list)

chia/_tests/wallet/test_wallet.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from chia.types.peer_info import PeerInfo
2020
from chia.types.signing_mode import CHIP_0002_SIGN_MESSAGE_PREFIX
2121
from chia.util.bech32m import encode_puzzle_hash
22+
from chia.util.byte_types import hexstr_to_bytes
2223
from chia.util.errors import Err
2324
from chia.wallet.conditions import ConditionValidTimes
2425
from chia.wallet.derive_keys import master_sk_to_wallet_sk
@@ -2008,9 +2009,9 @@ async def test_sign_message(self, wallet_environments: WalletTestFramework) -> N
20082009
puzzle: Program = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
20092010

20102011
assert AugSchemeMPL.verify(
2011-
G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
2012+
G1Element.from_bytes(hexstr_to_bytes(response["pubkey"])),
20122013
puzzle.get_tree_hash(),
2013-
G2Element.from_bytes(bytes.fromhex(response["signature"])),
2014+
G2Element.from_bytes(hexstr_to_bytes(response["signature"])),
20142015
)
20152016
# Test hex string
20162017
message = "0123456789ABCDEF"
@@ -2020,9 +2021,9 @@ async def test_sign_message(self, wallet_environments: WalletTestFramework) -> N
20202021
puzzle = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, bytes.fromhex(message)))
20212022

20222023
assert AugSchemeMPL.verify(
2023-
G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
2024+
G1Element.from_bytes(hexstr_to_bytes(response["pubkey"])),
20242025
puzzle.get_tree_hash(),
2025-
G2Element.from_bytes(bytes.fromhex(response["signature"])),
2026+
G2Element.from_bytes(hexstr_to_bytes(response["signature"])),
20262027
)
20272028
# Test informal input
20282029
message = "0123456789ABCDEF"
@@ -2032,9 +2033,9 @@ async def test_sign_message(self, wallet_environments: WalletTestFramework) -> N
20322033
puzzle = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, bytes.fromhex(message)))
20332034

20342035
assert AugSchemeMPL.verify(
2035-
G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
2036+
G1Element.from_bytes(hexstr_to_bytes(response["pubkey"])),
20362037
puzzle.get_tree_hash(),
2037-
G2Element.from_bytes(bytes.fromhex(response["signature"])),
2038+
G2Element.from_bytes(hexstr_to_bytes(response["signature"])),
20382039
)
20392040
# Test BLS sign string
20402041
message = "Hello World"
@@ -2043,9 +2044,9 @@ async def test_sign_message(self, wallet_environments: WalletTestFramework) -> N
20432044
)
20442045

20452046
assert AugSchemeMPL.verify(
2046-
G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
2047+
G1Element.from_bytes(hexstr_to_bytes(response["pubkey"])),
20472048
bytes(message, "utf-8"),
2048-
G2Element.from_bytes(bytes.fromhex(response["signature"])),
2049+
G2Element.from_bytes(hexstr_to_bytes(response["signature"])),
20492050
)
20502051
# Test BLS sign hex
20512052
message = "0123456789ABCDEF"
@@ -2054,9 +2055,9 @@ async def test_sign_message(self, wallet_environments: WalletTestFramework) -> N
20542055
)
20552056

20562057
assert AugSchemeMPL.verify(
2057-
G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
2058-
bytes.fromhex(message),
2059-
G2Element.from_bytes(bytes.fromhex(response["signature"])),
2058+
G1Element.from_bytes(hexstr_to_bytes(response["pubkey"])),
2059+
hexstr_to_bytes(message),
2060+
G2Element.from_bytes(hexstr_to_bytes(response["signature"])),
20602061
)
20612062

20622063
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)