Skip to content

Commit

Permalink
refactor: remove class name prefixes and log format string
Browse files Browse the repository at this point in the history
  • Loading branch information
kentbull committed Feb 5, 2025
1 parent f98e7be commit c87cb1c
Show file tree
Hide file tree
Showing 17 changed files with 148 additions and 174 deletions.
2 changes: 0 additions & 2 deletions src/keri/app/cli/commands/challenge/respond.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ def respondDo(self, tymth, tock=0.0, **opts):
del ims[:exn.size]

senderHab = hab.mhab if isinstance(hab, GroupHab) else hab
logger.info("RespondDoer: sending challenge exn from %s to %s", senderHab.pre, recp)
logger.debug("RespondDoer: Challenge exn body=\n%s\n", exn.pretty())
self.postman.send(src=senderHab.pre, dest=recp, topic="challenge", serder=exn, attachment=ims)
while not self.postman.cues:
yield self.tock
Expand Down
4 changes: 0 additions & 4 deletions src/keri/app/cli/commands/delegate/confirm.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ def confirmDo(self, tymth, tock=0.0):
others.remove(hab.mhab.pre)

for recpt in others: # send notification to other participants as a signalling mechanism
logger.info(
"ConfirmDoer: sending confirm notification exn from %s to %s",
hab.mhab.pre, recpt)
logger.debug("ConfirmDoer: Notification exn body=\n%s\n", exn.pretty())
self.postman.send(src=hab.mhab.pre, dest=recpt, topic="multisig", serder=exn,
attachment=atc)

Expand Down
10 changes: 0 additions & 10 deletions src/keri/app/cli/commands/delegate/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,7 @@ def requestDo(self, tymth, tock=0.0):
# delegate AID ICP and exn of delegation request EXN
srdr = serdering.SerderKERI(raw=evt)
del evt[:srdr.size]

logger.info(
"RequestDoer: sending delegated inception from delegate %s to delegator %s",
phab.pre, delpre)
logger.debug("RequestDoer: Delegated inception body=\n%s\n", exn.pretty())
self.postman.send(src=phab.pre, dest=delpre, topic="delegate", serder=srdr, attachment=evt)

logger.info(
"RequestDoer: sending request notification exn from delegate %s to delegator %s",
phab.pre, delpre)
logger.debug("RequestDoer: Notification exn body=\n%s\n", exn.pretty())
self.postman.send(src=phab.pre, dest=hab.kever.delpre, topic="delegate", serder=exn, attachment=atc)

while True:
Expand Down
4 changes: 0 additions & 4 deletions src/keri/app/cli/commands/ends/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ def roleDo(self, tymth, tock=0.0):

for recp in smids: # this goes to other participants only as a signaling mechanism
exn, atc = grouping.multisigRpyExn(ghab=self.hab, rpy=msg)
logger.info(
"RoleDoer: sending endpoint role add exn on %s from %s to %s",
"multisig", self.hab.mhab.pre, recp)
logger.debug("RoleDoer: Endpoint Role Add Exn body=\n%s\n", exn.pretty())
self.postman.send(src=self.hab.mhab.pre,
dest=recp,
topic="multisig",
Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/cli/commands/ipex/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def joinDo(self, tymth, tock=0.0):
self.tock = tock
_ = (yield self.tock)

print("IPEX JoinDoer: Waiting for group ipex events...")
print("Waiting for group ipex events...")

while True:

Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/cli/commands/multisig/incept.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def inceptDo(self, tymth, tock=0.0):
serder=exn,
attachment=ims)

logger.info(f"MS Incept: Group identifier inception initialized for {ghab.pre}")
print(f"Group identifier inception initialized for {ghab.pre}")
prefixer = coring.Prefixer(qb64=ghab.pre)
seqner = coring.Seqner(sn=0)
saider = coring.Saider(qb64=prefixer.qb64)
Expand Down
4 changes: 0 additions & 4 deletions src/keri/app/cli/commands/multisig/interact.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ def interactDo(self, tymth, tock=0.0):
others.remove(ghab.mhab.pre)

for recpt in others: # send notification to other participants as a signalling mechanism
logger.info(
"GroupMultisigInteract: sending multisig interact exn from %s to %s",
ghab.mhab.pre, recpt)
logger.debug("GroupMultisigInteract: interact exn body=\n%s\n", exn.pretty())
self.postman.send(src=ghab.mhab.pre, dest=recpt, topic="multisig", serder=exn, attachment=ims)

prefixer = coring.Prefixer(qb64=ghab.pre)
Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/cli/commands/multisig/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def joinDo(self, tymth, tock=0.0):
self.tock = tock
_ = (yield self.tock)

print("MS JoinDoer: Waiting for group multisig events...")
print("Waiting for group multisig events...")

while self.notifier.noter.notes.cntAll() == 0:
yield self.tock
Expand Down
8 changes: 6 additions & 2 deletions src/keri/app/cli/commands/witness/demo.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import argparse
import logging
import os

from hio.base import doing

Expand All @@ -19,18 +20,21 @@


parser = argparse.ArgumentParser(description="Run a demo collection of witnesses")
parser.add_argument("--loglevel", action="store", required=False, default=os.getenv("KERIA_LOG_LEVEL", "CRITICAL"),
help="Set log level to DEBUG | INFO | WARNING | ERROR | CRITICAL. Default is CRITICAL")
parser.set_defaults(handler=lambda args: demo(args))


help.ogler.level = logging.INFO
logger = help.ogler.getLogger()


def demo(_):
def demo(args):
"""
Run set of three witnesses for demo
"""
help.ogler.level = logging.getLevelName(args.loglevel.upper())
logger.setLevel(help.ogler.level)

wancf = configing.Configer(name="wan", headDirPath="scripts", temp=False, reopen=True, clear=False)
wilcf = configing.Configer(name="wil", headDirPath="scripts", temp=False, reopen=True, clear=False)
Expand Down
8 changes: 4 additions & 4 deletions src/keri/app/delegating.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def processPartialWitnessEscrow(self):
witnessed = True
if not witnessed:
continue
logger.info(f"Anchorer: Witness receipts complete, waiting for delegation approval.")
logger.info(f"Witness receipts complete, waiting for delegation approval.")
if pre not in self.hby.habs:
continue

Expand All @@ -193,15 +193,15 @@ def processPartialWitnessEscrow(self):
srdr = serdering.SerderKERI(raw=evt)
exn, atc = delegateRequestExn(phab, delpre=delpre, evt=bytes(evt), aids=smids)

logger.info("Anchorer: Sending delegation request exn for %s from %s to delegator %s",
logger.info("Sending delegation request exn for %s from %s to delegator %s",
srdr.ilk, phab.pre, delpre)
logger.debug("Delegation request=\n%s\n", exn.pretty())
self.postman.send(hab=phab, dest=hab.kever.delpre, topic="delegate", serder=exn, attachment=atc)

del evt[:srdr.size]
logger.info("Anchorer: Sending delegation event %s from %s to delegator %s",
logger.info("Sending delegation event %s from %s to delegator %s",
srdr.ilk, phab.pre, delpre)
logger.debug("Anchorer: Delegated inception=\n%s\n", srdr.pretty())
logger.debug("Delegated inception=\n%s\n", srdr.pretty())
self.postman.send(hab=phab, dest=delpre, topic="delegate", serder=srdr, attachment=evt)

seal = dict(i=srdr.pre, s=srdr.snh, d=srdr.said)
Expand Down
27 changes: 15 additions & 12 deletions src/keri/app/grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def start(self, ghab, prefixer, seqner, saider):
"""
evt = ghab.makeOwnEvent(sn=seqner.sn, allowPartiallySigned=True) # used just for the log message
serder = serdering.SerderKERI(raw=evt) # used just for the log message
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Multisig start; "
f"Waiting for other signatures for {serder.ilk} {prefixer.qb64}:{seqner.sn}...")
logger.info("Waiting for other signatures on %s for %s:%s...", serder.ilk, prefixer.qb64, seqner.sn)
return self.hby.db.gpse.add(keys=(prefixer.qb64,), val=(seqner, saider))

def complete(self, prefixer, seqner, saider=None):
Expand Down Expand Up @@ -132,7 +131,8 @@ def processPartialSignedEscrow(self):
if kever.delegated and kever.ilk in (coring.Ilks.dip, coring.Ilks.drt):
# We are a delegated identifier, must wait for delegator approval for dip and drt
if witered: # We are elected to perform delegation and witnessing messaging
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: We are the witnesser, sending {pre} to delegator")
logger.info("AID %s...%s: We are the witnesser, sending %s to delegator",
pre[:4], pre[-4:], pre)
self.swain.delegation(pre=pre, sn=seqner.sn)
else:
anchor = dict(i=pre, s=seqner.snh, d=saider.qb64)
Expand All @@ -141,15 +141,17 @@ def processPartialSignedEscrow(self):
else:
self.witq.query(src=ghab.mhab.pre, pre=kever.delpre, anchor=anchor)

logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Waiting for delegation approval...")
logger.info("AID %s...%s: Waiting for delegation approval...", pre[:4], pre[-4:])
self.hby.db.gdee.add(keys=(pre,), val=(seqner, saider))
else: # Non-delegation, move on to witnessing
if witered: # We are elected witnesser, send off event to witnesses
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: We are the fully signed witnesser {seqner.sn}, sending to witnesses")
logger.info("AID %s...%s: We are the fully signed witnesser %s, sending to witnesses",
pre[:4], pre[-4:], seqner.sn)
self.witDoer.msgs.append(dict(pre=pre, sn=seqner.sn))

# Move to escrow waiting for witness receipts
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Waiting for fully signed witness receipts for {seqner.sn}")
logger.info("AID %s...%s: Waiting for fully signed witness receipts for %s",
pre[:4], pre[-4:], seqner.sn)
self.hby.db.gpwe.add(keys=(pre,), val=(seqner, saider))

def processDelegateEscrow(self):
Expand All @@ -169,7 +171,8 @@ def processDelegateEscrow(self):
if witer: # We are elected witnesser, We've already done out part in Boatswain, we are done.
if self.swain.complete(prefixer=kever.prefixer, seqner=coring.Seqner(sn=kever.sn)):
self.hby.db.gdee.rem(keys=(pre,))
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Delegation approval for {pre} received.")
logger.info("AID %s...%s: Delegation approval for %s received.",
pre[:4], pre[-4:], pre)

self.hby.db.cgms.put(keys=(pre, seqner.qb64), val=saider)

Expand All @@ -181,10 +184,10 @@ def processDelegateEscrow(self):
dgkey = dbing.dgKey(pre, saider.qb64b)
self.hby.db.setAes(dgkey, couple) # authorizer event seal (delegator/issuer)
self.hby.db.gdee.rem(keys=(pre,))
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Delegation approval for {pre} received.")
logger.info("AID %s...%s: Delegation approval for %s received.", pre[:4], pre[-4:], pre)

# Move to escrow waiting for witness receipts
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Waiting for witness receipts for {pre}")
logger.info("AID %s...%s: Waiting for witness receipts for %s", pre[:4], pre[-4:], pre)
self.hby.db.gdee.rem(keys=(pre,))
self.hby.db.gpwe.add(keys=(pre,), val=(seqner, saider))

Expand Down Expand Up @@ -212,7 +215,7 @@ def processPartialWitnessEscrow(self):
witnessed = True
if not witnessed:
continue
logger.info(f"[Counselor {ghab.mhab.pre[:8]}]: Witness receipts complete, {pre} confirmed.")
logger.info("AID %s...%s: Witness receipts complete, %s confirmed.", pre[:4], pre[-4:], pre)
self.hby.db.gpwe.rem(keys=(pre,))
self.hby.db.cgms.put(keys=(pre, seqner.qb64), val=saider)
elif not witer:
Expand Down Expand Up @@ -243,8 +246,8 @@ def handle(self, serder, attachments=None):
attachments (list): list of tuples of pather, CESR SAD path attachments to the exn event
"""
logger.info("MS Note Hdlr: %s event SAID=%s", self.resource, serder.said)
logger.debug("MS Note Hdlr: EXN Body=\n%s\n", serder.pretty())
logger.info("Notification for %s event SAID=%s", self.resource, serder.said)
logger.debug("EXN Body=\n%s\n", serder.pretty())
self.mux.add(serder=serder)


Expand Down
4 changes: 2 additions & 2 deletions src/keri/app/storing.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ def responseDo(self, tymth=None, tock=0.0):
# sign the exn to get the signature
eattach = senderHab.endorse(exn, last=False, pipelined=False)
del eattach[:exn.size]
logger.info("Respondant: sending exn on %s from %s to %s", topic, sender, recipient)
logger.debug("Respondant: exn body=\n%s\n", exn.pretty())
logger.info("Sending exn on %s from %s to %s", topic, sender, recipient)
logger.debug("exn body=\n%s\n", exn.pretty())
self.postman.send(recipient, topic=topic, serder=exn, hab=forwardHab, attachment=eattach)

yield self.tock # throttle just do one cue at a time
Expand Down
Loading

0 comments on commit c87cb1c

Please sign in to comment.