Move account credentials to local-tools

beekeepy/beekeepy/_interface/account_credentials.py

-from __future__ import annotations
-
-from beekeepy._interface.key_pair import KeyPair
-from helpy._interfaces.wax import calculate_public_key, generate_private_key
-
-
-class AccountCredentials(KeyPair):
-    name: str
-
-    @classmethod
-    def create(cls, name: str) -> AccountCredentials:
-        pv_key = generate_private_key()
-        pub_key = calculate_public_key(pv_key)
-        return AccountCredentials(name=name, public_key=pub_key, private_key=pv_key)
-
-    @classmethod
-    def create_multiple(cls, number_of_accounts: int, *, name_base: str = "account") -> list[AccountCredentials]:
-        return [AccountCredentials.create(f"{name_base}-{i}") for i in range(number_of_accounts)]

beekeepy/beekeepy/interfaces.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from beekeepy._interface._sanitize import mask, sanitize
 from beekeepy._interface._suppress_api_not_found import SuppressApiNotFound
-from beekeepy._interface.account_credentials import AccountCredentials
 from beekeepy._interface.context import (
     ContextAsync,
     ContextSync,
@@ -20,7 +19,6 @@ from beekeepy._interface.stopwatch import Stopwatch, StopwatchResult
 from beekeepy._interface.url import HttpUrl, P2PUrl, Url, WsUrl
 
 __all__ = [
-    "AccountCredentials",
     "ContextAsync",
     "ContextSettingsUpdater",
     "ContextSync",

tests/beekeepy_test/handle/api_tests/test_api_close.py

@@ -9,8 +9,9 @@ from local_tools.beekeepy.models import WalletInfo
 from beekeepy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
+    from local_tools.beekeepy.account_credentials import AccountCredentials
+
     from beekeepy.handle.runnable import Beekeeper
-    from beekeepy.interfaces import AccountCredentials
 
 
 def test_api_close(beekeeper: Beekeeper, wallet: WalletInfo) -> None:

tests/beekeepy_test/handle/api_tests/test_api_has_matching_key.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from beekeepy.interfaces import AccountCredentials
+from local_tools.beekeepy.account_credentials import AccountCredentials
 
 if TYPE_CHECKING:
     from local_tools.beekeepy.models import WalletInfo
@@ -12,7 +12,7 @@ if TYPE_CHECKING:
 
 def test_api_has_matching_key(beekeeper: Beekeeper, wallet: WalletInfo) -> None:
     # ARRANGE
-    account = AccountCredentials.create("alice")
+    account = AccountCredentials.create()
     beekeeper.api.import_key(wallet_name=wallet.name, wif_key=account.private_key)
 
     # ACT

tests/beekeepy_test/handle/api_tests/test_api_import_key.py

@@ -7,10 +7,10 @@ import pytest
 from beekeepy.exceptions import ErrorInResponseError
 
 if TYPE_CHECKING:
+    from local_tools.beekeepy.account_credentials import AccountCredentials
     from local_tools.beekeepy.models import WalletInfo, WalletsGeneratorT
 
     from beekeepy.handle.runnable import Beekeeper
-    from beekeepy.interfaces import AccountCredentials
 
 
 def test_api_import_key(beekeeper: Beekeeper, setup_wallets: WalletsGeneratorT) -> None:

tests/beekeepy_test/handle/api_tests/test_api_remove_key.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import pytest
+from local_tools.beekeepy.account_credentials import AccountCredentials
 
 from beekeepy.exceptions import ErrorInResponseError
-from beekeepy.interfaces import AccountCredentials
 from schemas.fields.basic import PublicKey
 
 if TYPE_CHECKING:

tests/beekeepy_test/handle/conftest.py

@@ -4,9 +4,9 @@ from functools import wraps
 from typing import Iterator
 
 import pytest
+from local_tools.beekeepy.account_credentials import AccountCredentials
 from local_tools.beekeepy.generators import (
     default_wallet_credentials,
-    generate_account_name,
     generate_wallet_name,
     generate_wallet_password,
 )
@@ -18,7 +18,6 @@ from local_tools.beekeepy.models import (
 )
 
 from beekeepy.handle.runnable import Beekeeper
-from beekeepy.interfaces import AccountCredentials
 
 
 @pytest.fixture()
@@ -47,7 +46,7 @@ def wallet(beekeeper: Beekeeper) -> WalletInfo:
 
 @pytest.fixture()
 def account(beekeeper: Beekeeper, wallet: WalletInfo) -> AccountCredentials:
-    acc = AccountCredentials.create(generate_account_name())
+    acc = AccountCredentials.create()
     beekeeper.api.import_key(wallet_name=wallet.name, wif_key=acc.private_key)
     return acc
 
@@ -67,11 +66,7 @@ def setup_wallets(beekeeper: Beekeeper) -> WalletsGeneratorT:
             WalletInfoWithImportedAccounts(
                 name=generate_wallet_name(i),
                 password=generate_wallet_password(i),
-                accounts=(
-                    AccountCredentials.create_multiple(keys_per_wallet, name_base=generate_account_name(i))
-                    if keys_per_wallet
-                    else []
-                ),
+                accounts=(AccountCredentials.create_multiple(keys_per_wallet) if keys_per_wallet else []),
             )
             for i in range(count)
         ]

tests/beekeepy_test/handle/simple_flow/prepared_wallets/generate_wallets_and_keys.py

@@ -6,12 +6,12 @@ import json
 import sys
 from pathlib import Path
 
+from local_tools.beekeepy.account_credentials import AccountCredentials
 from local_tools.beekeepy.models import WalletInfoWithImportedAccounts
 from loguru import logger
 
 from beekeepy import Settings
 from beekeepy.handle.runnable import AsyncBeekeeper
-from beekeepy.interfaces import AccountCredentials
 
 
 async def generate_wallets_and_keys(number_of_wallets: int) -> None:

tests/beekeepy_test/handle/various/test_empty_sign_digest.py

@@ -7,10 +7,10 @@ from local_tools.beekeepy.network import raw_http_call
 from schemas.jsonrpc import JSONRPCRequest
 
 if TYPE_CHECKING:
+    from local_tools.beekeepy.account_credentials import AccountCredentials
     from local_tools.beekeepy.models import WalletInfo
 
     from beekeepy.handle.runnable import Beekeeper
-    from beekeepy.interfaces import AccountCredentials
 
 
 def test_empty_sign_digest(beekeeper: Beekeeper, wallet: WalletInfo, account: AccountCredentials) -> None:  # noqa: ARG001

tests/beekeepy_test/handle/various/test_sign_digest_response_uniques.py

@@ -7,10 +7,10 @@ from local_tools.beekeepy.network import raw_http_call
 from schemas.jsonrpc import JSONRPCRequest
 
 if TYPE_CHECKING:
+    from local_tools.beekeepy.account_credentials import AccountCredentials
     from local_tools.beekeepy.models import WalletInfo
 
     from beekeepy.handle.runnable import Beekeeper
-    from beekeepy.interfaces import AccountCredentials
 
 
 def test_sign_digest_response_uniques(beekeeper: Beekeeper, wallet: WalletInfo, account: AccountCredentials) -> None:  # noqa: ARG001

tests/local-tools/local_tools/beekeepy/models.py

@@ -9,7 +9,7 @@ if TYPE_CHECKING:
     from loguru import Logger
 
     from beekeepy import Settings
-    from beekeepy._interface.account_credentials import AccountCredentials
+    from local_tools.beekeepy.account_credentials import AccountCredentials
 
 
 @dataclass