diff --git a/src/keri/app/apping.py b/src/keri/app/apping.py index 7478aa1d2..4464633db 100644 --- a/src/keri/app/apping.py +++ b/src/keri/app/apping.py @@ -4,8 +4,6 @@ keri.app.apping module """ -import cmd - from hio.base import doing from hio.core.serial import serialing diff --git a/src/keri/app/cli/commands/challenge/generate.py b/src/keri/app/cli/commands/challenge/generate.py index e26e6f10e..169ea93c7 100644 --- a/src/keri/app/cli/commands/challenge/generate.py +++ b/src/keri/app/cli/commands/challenge/generate.py @@ -6,7 +6,7 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from mnemonic import mnemonic diff --git a/src/keri/app/cli/commands/challenge/verify.py b/src/keri/app/cli/commands/challenge/verify.py index db27501ee..f82fbf1c4 100644 --- a/src/keri/app/cli/commands/challenge/verify.py +++ b/src/keri/app/cli/commands/challenge/verify.py @@ -8,7 +8,7 @@ import datetime import sys -from hio import help +from keri import help from hio.base import doing from keri.app import indirecting, challenging, connecting, signaling diff --git a/src/keri/app/cli/commands/contacts/list.py b/src/keri/app/cli/commands/contacts/list.py index 1ba574483..b93c1e248 100644 --- a/src/keri/app/cli/commands/contacts/list.py +++ b/src/keri/app/cli/commands/contacts/list.py @@ -7,7 +7,7 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/did/generate.py b/src/keri/app/cli/commands/did/generate.py index 9e0cb28d1..5398ca35b 100644 --- a/src/keri/app/cli/commands/did/generate.py +++ b/src/keri/app/cli/commands/did/generate.py @@ -9,7 +9,7 @@ from urllib.parse import urlparse import sys -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/ends/add.py b/src/keri/app/cli/commands/ends/add.py index e672abfda..76cb623ec 100644 --- a/src/keri/app/cli/commands/ends/add.py +++ b/src/keri/app/cli/commands/ends/add.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/ends/export.py b/src/keri/app/cli/commands/ends/export.py index e1d54a2f3..e340272d8 100644 --- a/src/keri/app/cli/commands/ends/export.py +++ b/src/keri/app/cli/commands/ends/export.py @@ -6,12 +6,12 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri import kering from keri.app.cli.common import existing -from keri.core import coring, eventing +from keri.core import eventing logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/ends/list.py b/src/keri/app/cli/commands/ends/list.py index 533e39d95..1f0035a3b 100644 --- a/src/keri/app/cli/commands/ends/list.py +++ b/src/keri/app/cli/commands/ends/list.py @@ -7,13 +7,11 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from keri import kering -from keri.app import indirecting, habbing, forwarding, grouping from keri.app.cli.common import existing -from keri.core import eventing, parsing, coring logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/escrow/clear.py b/src/keri/app/cli/commands/escrow/clear.py index e715a4427..e6e98924e 100644 --- a/src/keri/app/cli/commands/escrow/clear.py +++ b/src/keri/app/cli/commands/escrow/clear.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing from keri.vdr import viring diff --git a/src/keri/app/cli/commands/escrow/list.py b/src/keri/app/cli/commands/escrow/list.py index 4e647c3d9..dd4aa8c5c 100644 --- a/src/keri/app/cli/commands/escrow/list.py +++ b/src/keri/app/cli/commands/escrow/list.py @@ -7,7 +7,7 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from keri.core import eventing diff --git a/src/keri/app/cli/commands/export.py b/src/keri/app/cli/commands/export.py index 7fe7dfff9..a2ef4d2b7 100644 --- a/src/keri/app/cli/commands/export.py +++ b/src/keri/app/cli/commands/export.py @@ -7,11 +7,11 @@ import argparse import sys -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing -from keri.core import coring, serdering +from keri.core import serdering logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/incept.py b/src/keri/app/cli/commands/incept.py index fbc59560a..87977ebd5 100644 --- a/src/keri/app/cli/commands/incept.py +++ b/src/keri/app/cli/commands/incept.py @@ -6,7 +6,7 @@ import argparse from dataclasses import dataclass -from hio import help +from keri import help from hio.base import doing from keri.app import habbing, agenting, indirecting, configing, delegating, forwarding diff --git a/src/keri/app/cli/commands/init.py b/src/keri/app/cli/commands/init.py index aa8479ec6..04a1ae45c 100644 --- a/src/keri/app/cli/commands/init.py +++ b/src/keri/app/cli/commands/init.py @@ -6,7 +6,7 @@ import argparse import getpass -from hio import help +from keri import help from hio.base import doing import keri.app.oobiing diff --git a/src/keri/app/cli/commands/ipex/list.py b/src/keri/app/cli/commands/ipex/list.py index 4f59d9816..89449d87f 100644 --- a/src/keri/app/cli/commands/ipex/list.py +++ b/src/keri/app/cli/commands/ipex/list.py @@ -10,7 +10,7 @@ import os import sys -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/kevers.py b/src/keri/app/cli/commands/kevers.py index 3eaf42aca..3cc6eb905 100644 --- a/src/keri/app/cli/commands/kevers.py +++ b/src/keri/app/cli/commands/kevers.py @@ -8,12 +8,12 @@ import datetime import sys -from hio import help +from keri import help from hio.base import doing from keri.app import indirecting from keri.app.cli.common import displaying, existing -from keri.core import coring, serdering +from keri.core import serdering from keri.help import helping logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/list.py b/src/keri/app/cli/commands/list.py index d02f162ca..4d36d622f 100644 --- a/src/keri/app/cli/commands/list.py +++ b/src/keri/app/cli/commands/list.py @@ -6,11 +6,10 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing -from keri.kering import ConfigurationError logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/local/watch.py b/src/keri/app/cli/commands/local/watch.py index 6529f80e9..3558a0f44 100644 --- a/src/keri/app/cli/commands/local/watch.py +++ b/src/keri/app/cli/commands/local/watch.py @@ -9,12 +9,11 @@ import time from collections import namedtuple -from hio import help +from keri import help from hio.base import doing from keri.app import agenting, indirecting, habbing, forwarding from keri.app.cli.common import existing, terming from keri.app.habbing import GroupHab -from keri.core import coring logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/mailbox/debug.py b/src/keri/app/cli/commands/mailbox/debug.py index de7f425ba..6cf5fe964 100644 --- a/src/keri/app/cli/commands/mailbox/debug.py +++ b/src/keri/app/cli/commands/mailbox/debug.py @@ -6,15 +6,13 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri import kering -from keri.app import agenting, indirecting, habbing, httping -from keri.app.cli.common import displaying, existing +from keri.app import agenting, habbing, httping +from keri.app.cli.common import existing from keri.app.habbing import GroupHab -from keri.core import coring -from keri.kering import ConfigurationError logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/mailbox/update.py b/src/keri/app/cli/commands/mailbox/update.py index 0c191bb94..8ac16cd93 100644 --- a/src/keri/app/cli/commands/mailbox/update.py +++ b/src/keri/app/cli/commands/mailbox/update.py @@ -5,7 +5,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/migrate/show.py b/src/keri/app/cli/commands/migrate/show.py index 1ff745815..6bf3392c5 100644 --- a/src/keri/app/cli/commands/migrate/show.py +++ b/src/keri/app/cli/commands/migrate/show.py @@ -5,7 +5,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/multisig/continue.py b/src/keri/app/cli/commands/multisig/continue.py index 2a2508f97..f419a7418 100644 --- a/src/keri/app/cli/commands/multisig/continue.py +++ b/src/keri/app/cli/commands/multisig/continue.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app import indirecting, grouping, agenting diff --git a/src/keri/app/cli/commands/multisig/interact.py b/src/keri/app/cli/commands/multisig/interact.py index 77b98ff73..b5abef1e8 100644 --- a/src/keri/app/cli/commands/multisig/interact.py +++ b/src/keri/app/cli/commands/multisig/interact.py @@ -7,7 +7,7 @@ import argparse from ordered_set import OrderedSet as oset -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/multisig/notice.py b/src/keri/app/cli/commands/multisig/notice.py index 70902b2fb..fe4ca2769 100644 --- a/src/keri/app/cli/commands/multisig/notice.py +++ b/src/keri/app/cli/commands/multisig/notice.py @@ -6,7 +6,7 @@ import argparse from ordered_set import OrderedSet as oset -from hio import help +from keri import help from hio.base import doing from keri.app import habbing, forwarding, grouping diff --git a/src/keri/app/cli/commands/multisig/rotate.py b/src/keri/app/cli/commands/multisig/rotate.py index 126534ec2..a1727ff84 100644 --- a/src/keri/app/cli/commands/multisig/rotate.py +++ b/src/keri/app/cli/commands/multisig/rotate.py @@ -7,7 +7,7 @@ import argparse from ordered_set import OrderedSet as oset -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/multisig/update.py b/src/keri/app/cli/commands/multisig/update.py index 4ef7d19fc..f528bcf18 100644 --- a/src/keri/app/cli/commands/multisig/update.py +++ b/src/keri/app/cli/commands/multisig/update.py @@ -6,7 +6,7 @@ import argparse import time -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/oobi/clean.py b/src/keri/app/cli/commands/oobi/clean.py index cd2dc1d46..2dead78d1 100644 --- a/src/keri/app/cli/commands/oobi/clean.py +++ b/src/keri/app/cli/commands/oobi/clean.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/oobi/generate.py b/src/keri/app/cli/commands/oobi/generate.py index f2ac4ba68..2cb0082ee 100644 --- a/src/keri/app/cli/commands/oobi/generate.py +++ b/src/keri/app/cli/commands/oobi/generate.py @@ -7,7 +7,7 @@ from urllib.parse import urlparse import sys -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/oobi/resolve.py b/src/keri/app/cli/commands/oobi/resolve.py index 9b835b30f..b31640e19 100644 --- a/src/keri/app/cli/commands/oobi/resolve.py +++ b/src/keri/app/cli/commands/oobi/resolve.py @@ -5,14 +5,13 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing import keri.app.oobiing from keri.app import habbing, oobiing from keri.app.cli.common import existing from keri.db import basing -from keri.end import ending from keri.help import helping logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/passcode/remove.py b/src/keri/app/cli/commands/passcode/remove.py index 82b6b04f7..68c0aabe2 100644 --- a/src/keri/app/cli/commands/passcode/remove.py +++ b/src/keri/app/cli/commands/passcode/remove.py @@ -5,7 +5,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/passcode/set.py b/src/keri/app/cli/commands/passcode/set.py index a31f978bb..3081a780b 100644 --- a/src/keri/app/cli/commands/passcode/set.py +++ b/src/keri/app/cli/commands/passcode/set.py @@ -6,7 +6,7 @@ import argparse import getpass -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/query.py b/src/keri/app/cli/commands/query.py index dc9a1b220..53e6db690 100644 --- a/src/keri/app/cli/commands/query.py +++ b/src/keri/app/cli/commands/query.py @@ -7,7 +7,7 @@ import datetime import json -from hio import help +from keri import help from hio.base import doing from hio.help import decking diff --git a/src/keri/app/cli/commands/rename.py b/src/keri/app/cli/commands/rename.py index 60fff68ef..7d975d05c 100644 --- a/src/keri/app/cli/commands/rename.py +++ b/src/keri/app/cli/commands/rename.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/rollback.py b/src/keri/app/cli/commands/rollback.py index f7d573f45..1cfce3b7c 100644 --- a/src/keri/app/cli/commands/rollback.py +++ b/src/keri/app/cli/commands/rollback.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/saidify.py b/src/keri/app/cli/commands/saidify.py index 280035fb8..c89fb664b 100644 --- a/src/keri/app/cli/commands/saidify.py +++ b/src/keri/app/cli/commands/saidify.py @@ -6,7 +6,7 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from keri.core import coring diff --git a/src/keri/app/cli/commands/ssh/export.py b/src/keri/app/cli/commands/ssh/export.py index 0f0eff8da..0b45ad472 100644 --- a/src/keri/app/cli/commands/ssh/export.py +++ b/src/keri/app/cli/commands/ssh/export.py @@ -11,7 +11,7 @@ from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric import ed25519 -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/status.py b/src/keri/app/cli/commands/status.py index 787bae9ad..130bd50ee 100644 --- a/src/keri/app/cli/commands/status.py +++ b/src/keri/app/cli/commands/status.py @@ -6,11 +6,11 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import displaying, existing -from keri.core import coring, serdering +from keri.core import serdering from keri.kering import ConfigurationError logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/vc/create.py b/src/keri/app/cli/commands/vc/create.py index e30b632dc..7cd815cae 100644 --- a/src/keri/app/cli/commands/vc/create.py +++ b/src/keri/app/cli/commands/vc/create.py @@ -1,7 +1,7 @@ import argparse import json -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/vc/export.py b/src/keri/app/cli/commands/vc/export.py index f79e2b693..d4821dd7b 100644 --- a/src/keri/app/cli/commands/vc/export.py +++ b/src/keri/app/cli/commands/vc/export.py @@ -7,7 +7,7 @@ import argparse import sys -from hio import help +from keri import help from hio.base import doing from keri.app import signing diff --git a/src/keri/app/cli/commands/vc/list.py b/src/keri/app/cli/commands/vc/list.py index 45717c015..d1528b31f 100644 --- a/src/keri/app/cli/commands/vc/list.py +++ b/src/keri/app/cli/commands/vc/list.py @@ -9,7 +9,7 @@ import json import sys -from hio import help +from keri import help from hio.base import doing from keri import kering diff --git a/src/keri/app/cli/commands/vc/registry/incept.py b/src/keri/app/cli/commands/vc/registry/incept.py index 77c774f9a..6b6b3243d 100644 --- a/src/keri/app/cli/commands/vc/registry/incept.py +++ b/src/keri/app/cli/commands/vc/registry/incept.py @@ -1,13 +1,13 @@ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app import indirecting, habbing, grouping, forwarding from keri.app.cli.common import existing from keri.app.habbing import GroupHab from keri.app.notifying import Notifier -from keri.core import coring, serdering +from keri.core import serdering from keri.core.eventing import SealEvent from keri.peer import exchanging from keri.vdr import credentialing diff --git a/src/keri/app/cli/commands/vc/registry/list.py b/src/keri/app/cli/commands/vc/registry/list.py index 3c299895a..90d4c923e 100644 --- a/src/keri/app/cli/commands/vc/registry/list.py +++ b/src/keri/app/cli/commands/vc/registry/list.py @@ -6,7 +6,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app.cli.common import existing diff --git a/src/keri/app/cli/commands/vc/registry/status.py b/src/keri/app/cli/commands/vc/registry/status.py index f24f57a50..55de01ca2 100644 --- a/src/keri/app/cli/commands/vc/registry/status.py +++ b/src/keri/app/cli/commands/vc/registry/status.py @@ -1,11 +1,11 @@ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app import indirecting, habbing, grouping from keri.app.cli.common import existing -from keri.core import coring, serdering +from keri.core import serdering from keri.vdr import credentialing logger = help.ogler.getLogger() diff --git a/src/keri/app/cli/commands/witness/submit.py b/src/keri/app/cli/commands/witness/submit.py index 1aaae2808..652b0541e 100644 --- a/src/keri/app/cli/commands/witness/submit.py +++ b/src/keri/app/cli/commands/witness/submit.py @@ -5,7 +5,7 @@ """ import argparse -from hio import help +from keri import help from hio.base import doing from keri.app import habbing, agenting, indirecting diff --git a/src/keri/app/cli/kli.py b/src/keri/app/cli/kli.py index a3bd13631..a0bde194f 100644 --- a/src/keri/app/cli/kli.py +++ b/src/keri/app/cli/kli.py @@ -4,7 +4,7 @@ """ import multicommand -from hio import help +from keri import help from keri.app import directing from keri.app.cli import commands diff --git a/src/keri/app/delegating.py b/src/keri/app/delegating.py index 107cb2e1b..ff0418ba4 100644 --- a/src/keri/app/delegating.py +++ b/src/keri/app/delegating.py @@ -6,13 +6,13 @@ module for enveloping and forwarding KERI message """ -from hio import help +from keri import help from hio.base import doing from . import agenting, forwarding from .habbing import GroupHab from .. import kering -from ..core import coring, eventing, serdering +from ..core import coring, serdering from ..db import dbing from ..peer import exchanging diff --git a/src/keri/app/forwarding.py b/src/keri/app/forwarding.py index 748a09a6a..b4105b2a1 100644 --- a/src/keri/app/forwarding.py +++ b/src/keri/app/forwarding.py @@ -9,17 +9,18 @@ from ordered_set import OrderedSet as oset from hio.base import doing -from hio.help import decking, ogler +from hio.help import decking from keri import kering from keri.app import agenting from keri.app.habbing import GroupHab +from keri import help from keri.core import coring, eventing, serdering from keri.db import dbing from keri.kering import Roles from keri.peer import exchanging -logger = ogler.getLogger() +logger = help.ogler.getLogger() class Poster(doing.DoDoer): diff --git a/src/keri/demo/demo_kev.py b/src/keri/demo/demo_kev.py index 00b9cca7c..7b125b0a3 100644 --- a/src/keri/demo/demo_kev.py +++ b/src/keri/demo/demo_kev.py @@ -8,11 +8,10 @@ import argparse import logging -from hio import help +from keri import help from hio.base import doing -from ..app import habbing, keeping, apping -from ..db import basing +from ..app import apping logger = help.ogler.getLogger() diff --git a/src/keri/vdr/viring.py b/src/keri/vdr/viring.py index 409b510c2..b57d98e3e 100644 --- a/src/keri/vdr/viring.py +++ b/src/keri/vdr/viring.py @@ -17,12 +17,9 @@ from ..app import signing from ..core import coring, serdering from ..db import dbing, basing -from ..db.dbing import snKey -from ..help import helping -from ..vc import proving from ..vdr import eventing -from hio import help +from keri import help logger = help.ogler.getLogger() diff --git a/tests/help/test_ogling.py b/tests/help/test_ogling.py index 78cd3777d..55ff5521c 100644 --- a/tests/help/test_ogling.py +++ b/tests/help/test_ogling.py @@ -8,7 +8,7 @@ import os import logging -from hio.help import ogling +from keri.help import ogling from keri import help