fix: match dig or edig type to db function return type

Author: kentbull

src/keri/core/eventing.py

@@ -5457,20 +5457,21 @@ def processEscrowOutOfOrders(self):
         key = ekey = b''  # both start same. when not same means escrows found
         while True:  # break when done
             for ekey, edig in self.db.getOoeItemIter(key=key):
+                dig = bytes(edig).decode()
                 try:
                     pre, sn = splitSnKey(ekey)  # get pre and sn from escrow item
                     dgkey = dgKey(pre, bytes(edig))
                     if not (esr := self.db.esrs.get(keys=dgkey)):  # get event source, otherwise error
                         # no local source so raise ValidationError which unescrows below
-                        msg = f"OOO Missing escrowed event source at dig = {bytes(edig).decode()}"
+                        msg = f"OOO Missing escrowed event source at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
                     # check date if expired then remove escrow.
                     dtb = self.db.getDts(dgkey)
                     if dtb is None:  # othewise is a datetime as bytes
                         # no date time so raise ValidationError which unescrows below
-                        msg = f"OOO Missing escrowed event datetime at dig = {bytes(edig).decode()}"
+                        msg = f"OOO Missing escrowed event datetime at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
@@ -5479,15 +5480,15 @@ def processEscrowOutOfOrders(self):
                     dte = helping.fromIso8601(bytes(dtb))
                     if (dtnow - dte) > datetime.timedelta(seconds=self.TimeoutOOE):
                         # escrow stale so raise ValidationError which unescrows below
-                        msg = f"OOO Stale event escrow at dig = {bytes(edig).decode()}"
+                        msg = f"OOO Stale event escrow at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
                     # get the escrowed event using edig
                     eraw = self.db.getEvt(dgKey(pre, bytes(edig)))
                     if eraw is None:
                         # no event so raise ValidationError which unescrows below
-                        msg = f"OOO Missing escrowed event at dig = {bytes(edig).decode()}"
+                        msg = f"OOO Missing escrowed event at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
@@ -5589,21 +5590,22 @@ def processEscrowPartialSigs(self):
         #key = ekey = b''  # both start same. when not same means escrows found
         #while True:  # break when done
         for ekey, edig in self.db.getPseItemIter(key=b''):
+            dig = bytes(edig).decode()
             eserder = None
             try:
                 pre, sn = splitSnKey(ekey)  # get pre and sn from escrow item
                 dgkey = dgKey(pre, bytes(edig))
                 if not (esr := self.db.esrs.get(keys=dgkey)):  # get event source, otherwise error
                     # no local source so raise ValidationError which unescrows below
-                    msg = f"PSE Missing escrowed event source at dig = {edig}"
+                    msg = f"PSE Missing escrowed event source at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # check date if expired then remove escrow.
                 dtb = self.db.getDts(dgkey)
                 if dtb is None:  # othewise is a datetime as bytes
                     # no date time so raise ValidationError which unescrows below
-                    msg = f"PSE Missing escrowed event datetime at dig = {edig}"
+                    msg = f"PSE Missing escrowed event datetime at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -5612,15 +5614,15 @@ def processEscrowPartialSigs(self):
                 dte = helping.fromIso8601(bytes(dtb))
                 if (dtnow - dte) > datetime.timedelta(seconds=self.TimeoutPSE):
                     # escrow stale so raise ValidationError which unescrows below
-                    msg = f"PSE Stale event escrow at dig = {edig}"
+                    msg = f"PSE Stale event escrow at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # get the escrowed event using edig
                 eraw = self.db.getEvt(dgkey)
                 if eraw is None:
                     # no event so so raise ValidationError which unescrows below
-                    msg = f"PSE Missing escrowed evt at dig = {edig}"
+                    msg = f"PSE Missing escrowed evt at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -5629,7 +5631,7 @@ def processEscrowPartialSigs(self):
                 sigs = self.db.getSigs(dgkey)
                 if not sigs:  # otherwise its a list of sigs
                     # no sigs so raise ValidationError which unescrows below
-                    msg = f"PSE Missing escrowed evt sigs at dig = {edig}"
+                    msg = f"PSE Missing escrowed evt sigs at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
                 wigs = self.db.getWigs(dgKey(pre, bytes(edig)))  # list of wigs
@@ -5758,20 +5760,21 @@ def processEscrowPartialWigs(self):
                         If successful then remove from escrow table
         """
         for ekey, edig in self.db.getPweItemIter(key=b''):
+            dig = bytes(edig).decode()
             try:
                 pre, sn = splitSnKey(ekey)  # get pre and sn from escrow item
                 dgkey = dgKey(pre, bytes(edig))
                 if not (esr := self.db.esrs.get(keys=dgkey)):  # get event source, otherwise error
                     # no local source so raise ValidationError which unescrows below
-                    msg = f"PWE Missing escrowed event source at dig = {edig}"
+                    msg = f"PWE Missing escrowed event source at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # check date if expired then remove escrow.
                 dtb = self.db.getDts(dgkey)
                 if dtb is None:  # othewise is a datetime as bytes
                     # no date time so raise ValidationError which unescrows below
-                    msg = f"PWE Missing escrowed event datetime at dig = {edig}"
+                    msg = f"PWE Missing escrowed event datetime at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -5780,15 +5783,15 @@ def processEscrowPartialWigs(self):
                 dte = helping.fromIso8601(bytes(dtb))
                 if (dtnow - dte) > datetime.timedelta(seconds=self.TimeoutPWE):
                     # escrow stale so raise ValidationError which unescrows below
-                    msg = f"PWE Stale event escrow at dig = {edig}"
+                    msg = f"PWE Stale event escrow at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # get the escrowed event using edig
                 eraw = self.db.getEvt(dgKey(pre, bytes(edig)))
                 if eraw is None:
                     # no event so so raise ValidationError which unescrows below
-                    msg = f"PWE Missing escrowed evt at dig = {edig}"
+                    msg = f"PWE Missing escrowed evt at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -5798,7 +5801,7 @@ def processEscrowPartialWigs(self):
                 sigs = self.db.getSigs(dgKey(pre, bytes(edig)))  # list of sigs
                 if not sigs:  # empty list
                     # no sigs so raise ValidationError which unescrows below
-                    msg = f"PWE Missing escrowed evt sigs at dig = {edig}"
+                    msg = f"PWE Missing escrowed evt sigs at dig = {dig}"
                     logger.trace("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -5812,7 +5815,7 @@ def processEscrowPartialWigs(self):
                     # so just log for debugging but do not unescrow by raising
                     # ValidationError
                     logger.debug("Kevery unescrow wigs: PW No event wigs yet at."
-                                 "dig = %s", bytes(edig).decode())
+                                 "dig = %s", dig)
 
                     # raise ValidationError("Missing escrowed evt wigs at "
                     # "dig = {}.".format(bytes(edig)))
@@ -5957,7 +5960,7 @@ def processEscrowPartialDels(self):
                 if not sigs:  # empty list
                     # no sigs so raise ValidationError which unescrows below
                     msg = f"PDE Missing escrowed evt sigs at dig = {edig}"
-                    logger.info("Kevery unescrow error: %s", bytes(edig))
+                    logger.info("Kevery unescrow error: %s", edig)
                     raise ValidationError(msg)
 
                 # get witness signatures (wigs not wits) assumes wont be in this
@@ -5972,10 +5975,10 @@ def processEscrowPartialDels(self):
                     ## so just log for debugging but do not unescrow by raising
                     ## ValidationError
                     #logger.info("Kevery unescrow error: Missing event wigs at."
-                                #"dig = %s", bytes(edig))
+                                #"dig = %s", edig)
 
                     #raise ValidationError("Missing escrowed evt wigs at "
-                                          #"dig = {}.".format(bytes(edig)))
+                                          #"dig = {}.".format(edig))
 
                 # setup parameters to process event
                 sigers = [Siger(qb64b=bytes(sig)) for sig in sigs]
@@ -6352,15 +6355,15 @@ def processEscrowDelegables(self):
                 dgkey = dgKey(pre.encode("utf-8"), edig)
                 if not (esr := self.db.esrs.get(keys=dgkey)):  # get event source, otherwise error
                     # no local source so raise ValidationError which unescrows below
-                    msg = f"DEL Missing escrowed event source at dig = {edig}"
+                    msg = f"DEL Missing escrowed event source at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # check date if expired then remove escrow.
                 dtb = self.db.getDts(dgkey)
                 if dtb is None:  # othewise is a datetime as bytes
                     # no date time so raise ValidationError which unescrows below
-                    msg = f"DEL Missing escrowed event datetime at dig = {edig}"
+                    msg = f"DEL Missing escrowed event datetime at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -6369,15 +6372,15 @@ def processEscrowDelegables(self):
                 dte = helping.fromIso8601(bytes(dtb))
                 if (dtnow - dte) > datetime.timedelta(seconds=self.TimeoutOOE):
                     # escrow stale so raise ValidationError which unescrows below
-                    msg = f"DEL Stale event escrow at dig = {edig}"
+                    msg = f"DEL Stale event escrow at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
                 # get the escrowed event using edig
                 eraw = self.db.getEvt(dgKey(pre, bytes(edig)))
                 if eraw is None:
                     # no event so raise ValidationError which unescrows below
-                    msg = f"DEL Missing escrowed evt at dig = {edig}"
+                    msg = f"DEL Missing escrowed evt at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -6387,7 +6390,7 @@ def processEscrowDelegables(self):
                 sigs = self.db.getSigs(dgKey(pre, bytes(edig)))
                 if not sigs:  # otherwise its a list of sigs
                     # no sigs so raise ValidationError which unescrows below
-                    msg = f"DEL Missing escrowed evt sigs at dig = {edig}"
+                    msg = f"DEL Missing escrowed evt sigs at dig = {dig}"
                     logger.info("Kevery unescrow error: %s", msg)
                     raise ValidationError(msg)
 
@@ -6854,20 +6857,21 @@ def processEscrowDuplicitous(self):
         key = ekey = b''  # both start same. when not same means escrows found
         while True:  # break when done
             for ekey, edig in self.db.getLdeItemIter(key=key):
+                dig = bytes(edig).decode()
                 try:
                     pre, sn = splitSnKey(ekey)  # get pre and sn from escrow item
                     dgkey = dgKey(pre, bytes(edig))
                     if not (esr := self.db.esrs.get(keys=dgkey)):  # get event source, otherwise error
                         # no local source so raise ValidationError which unescrows below
-                        msg = f"DUP Missing escrowed event source at dig = {edig}"
+                        msg = f"DUP Missing escrowed event source at dig = {dig}"
                         logger.info("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
                     # check date if expired then remove escrow.
                     dtb = self.db.getDts(dgkey)
                     if dtb is None:  # othewise is a datetime as bytes
                         # no date time so raise ValidationError which unescrows below
-                        msg = f"DUP Missing escrowed event datetime at dig = {edig}"
+                        msg = f"DUP Missing escrowed event datetime at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
@@ -6876,15 +6880,15 @@ def processEscrowDuplicitous(self):
                     dte = helping.fromIso8601(bytes(dtb))
                     if (dtnow - dte) > datetime.timedelta(seconds=self.TimeoutLDE):
                         # escrow stale so raise ValidationError which unescrows below
-                        msg = f"DUP Stale event escrow at dig = {edig}"
+                        msg = f"DUP Stale event escrow at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
                     # get the escrowed event using edig
                     eraw = self.db.getEvt(dgKey(pre, bytes(edig)))
                     if eraw is None:
                         # no event so raise ValidationError which unescrows below
-                        msg = f"DUP Missing escrowed evt at dig = {edig}"
+                        msg = f"DUP Missing escrowed evt at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)
 
@@ -6894,7 +6898,7 @@ def processEscrowDuplicitous(self):
                     sigs = self.db.getSigs(dgKey(pre, bytes(edig)))
                     if not sigs:  # otherwise its a list of sigs
                         # no sigs so raise ValidationError which unescrows below
-                        msg = f"DUP Missing escrowed evt sigs at dig = {edig}"
+                        msg = f"DUP Missing escrowed evt sigs at dig = {dig}"
                         logger.trace("Kevery unescrow error: %s", msg)
                         raise ValidationError(msg)