Fixing imports for refactor and circular avoidance.

nkms/config/config.py

@@ -1,11 +1,11 @@
 import os
 
 from eth_account import Account
-from umbral.bignum import BigNum
+
 from umbral.keys import UmbralPrivateKey
 from web3.auto import w3
 
-from nkms.config import utils
+
 from nkms.config.utils import _derive_wrapping_key_from_master_key, _decrypt_key
 from nkms.crypto.powers import SigningPower, EncryptingPower, KeyPairBasedPower
 from nkms.keystore.keypairs import SigningKeypair, EncryptingKeypair

nkms/config/utils.py

@@ -114,7 +114,7 @@ def _generate_signing_keys() -> tuple:
 
 def _parse_keyfile(keypath: str):
     """Parses a keyfile and returns key metadata as a dict."""
-
+    from nkms.config.config import KMSConfig
     with open(keypath, 'r') as keyfile:
         try:
             key_metadata = json.loads(keyfile)
@@ -126,7 +126,7 @@ def _parse_keyfile(keypath: str):
 
 def _save_keyfile(keypath: str, key_data: dict) -> None:
     """Saves key data to a file"""
-
+    from nkms.config.config import KMSConfig
     with open(keypath, 'w+') as keyfile:
 
         # Check_if the file is empty

nkms/keystore/keystore.py

@@ -3,7 +3,7 @@ from typing import Union
 from nkms.crypto.constants import KFRAG_LENGTH
 from nkms.crypto.signature import Signature
 from bytestring_splitter import BytestringSplitter
-from nkms.keystore.db.models import Key, PolicyContract, Workorder
+from nkms.keystore.db.models import Key, PolicyArrangement, Workorder
 from umbral.fragments import KFrag
 from umbral.keys import UmbralPublicKey
 from . import keypairs

nkms/policy/models.py

@@ -15,7 +15,6 @@ from nkms.crypto.powers import SigningPower
 from nkms.crypto.signature import Signature
 from nkms.crypto.splitters import key_splitter
 from bytestring_splitter import BytestringSplitter
-from nkms.network.constants import BYTESTRING_IS_TREASURE_MAP
 from nkms_eth.policies import BlockchainArrangement
 from umbral.pre import Capsule
 from constant_sorrow import constants