Chia-Network/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2024-10-26 20:40:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

add_private_key now returns the fingerprint of the added key (#13814)

Browse Source 
* add_private_key now returns the fingerprint of the added key
Updated tests

* Addressed feedback

* Update tests/core/daemon/test_daemon.py

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>

Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
This commit is contained in:
Jeff 2022-11-05 15:49:29 -07:00 committed by GitHub
parent 1220fcfd69
commit 7b781cbf12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chia/daemon/keychain_server.py
View File

@ -166,7 +166,7 @@ class KeychainServer:
}
try:
self.get_keychain_for_request(request).add_private_key(mnemonic, label)
sk = self.get_keychain_for_request(request).add_private_key(mnemonic, label)
except KeyError as e:
return {
"success": False,
@ -180,7 +180,7 @@ class KeychainServer:
"error": str(e),
}
return {"success": True}
return {"success": True, "fingerprint": sk.get_g1().get_fingerprint()}
async def check_keys(self, request: Dict[str, Any]) -> Dict[str, Any]:
if self.get_keychain_for_request(request).is_keyring_locked():

31
tests/core/daemon/test_daemon.py
View File

@ -59,6 +59,13 @@ success_response_data = {
}
def add_private_key_response_data(fingerprint: int) -> Dict[str, object]:
return {
"success": True,
"fingerprint": fingerprint,
}
def fingerprint_missing_response_data(request_type: Type[object]) -> Dict[str, object]:
return {
"success": False,
@ -534,7 +541,7 @@ async def test_add_private_key(daemon_connection_and_temp_keychain):
await ws.send_str(create_payload("add_private_key", {"mnemonic": test_key_data.mnemonic_str()}, "test", "daemon"))
# Expect: key was added successfully
assert_response(await ws.receive(), success_response_data)
assert_response(await ws.receive(), add_private_key_response_data(test_key_data.fingerprint))
# When: missing mnemonic
await ws.send_str(create_payload("add_private_key", {}, "test", "daemon"))
@ -561,9 +568,11 @@ async def test_add_private_key(daemon_connection_and_temp_keychain):
async def test_add_private_key_label(daemon_connection_and_temp_keychain):
ws, keychain = daemon_connection_and_temp_keychain
async def assert_add_private_key_with_label(key_data: KeyData, request: Dict[str, object]) -> None:
async def assert_add_private_key_with_label(
key_data: KeyData, request: Dict[str, object], add_private_key_response: Dict[str, object]
) -> None:
await ws.send_str(create_payload("add_private_key", request, "test", "daemon"))
assert_response(await ws.receive(), success_response_data)
assert_response(await ws.receive(), add_private_key_response)
await ws.send_str(
create_payload("get_key", {"fingerprint": key_data.fingerprint, "include_secrets": True}, "test", "daemon")
)
@ -571,14 +580,24 @@ async def test_add_private_key_label(daemon_connection_and_temp_keychain):
# without `label` parameter
key_data_0 = KeyData.generate()
await assert_add_private_key_with_label(key_data_0, {"mnemonic": key_data_0.mnemonic_str()})
await assert_add_private_key_with_label(
key_data_0,
{"mnemonic": key_data_0.mnemonic_str()},
add_private_key_response_data(key_data_0.fingerprint),
)
# with `label=None`
key_data_1 = KeyData.generate()
await assert_add_private_key_with_label(key_data_1, {"mnemonic": key_data_1.mnemonic_str(), "label": None})
await assert_add_private_key_with_label(
key_data_1,
{"mnemonic": key_data_1.mnemonic_str(), "label": None},
add_private_key_response_data(key_data_1.fingerprint),
)
# with `label="key_2"`
key_data_2 = KeyData.generate("key_2")
await assert_add_private_key_with_label(
key_data_1, {"mnemonic": key_data_2.mnemonic_str(), "label": key_data_2.label}
key_data_1,
{"mnemonic": key_data_2.mnemonic_str(), "label": key_data_2.label},
add_private_key_response_data(key_data_2.fingerprint),
)