Skip to content

Commit

Permalink
more porting to new versioned Counter
Browse files Browse the repository at this point in the history
  • Loading branch information
@SmithSamuelM
SmithSamuelM committed Jul 24, 2024
1 parent 0d36aba commit f8420a3
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 46 deletions.
17 changes: 9 additions & 8 deletions src/keri/app/habbing.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from .. import help
from .. import kering
from .. import core
from ..core import coring, eventing, parsing, routing, serdering, indexing
from ..core import (coring, eventing, parsing, routing, serdering, indexing,
Counter, Codens)
from ..db import dbing, basing
from ..kering import MissingSignatureError, Roles

Expand Down Expand Up @@ -1567,8 +1568,8 @@ def makeOtherEvent(self, pre, sn):
dig = bytes(dig)
key = dbing.dgKey(pre, dig) # digest key
msg.extend(self.db.getEvt(key))
msg.extend(coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=self.db.cntSigs(key)).qb64b) # attach cnt
msg.extend(Counter(Codens.ControllerIdxSigs, count=self.db.cntSigs(key),
gvrsn=kering.Vrsn_1_0).qb64b) # attach cnt
for sig in self.db.getSigsIter(key):
msg.extend(sig) # attach sig
return msg
Expand Down Expand Up @@ -2035,14 +2036,14 @@ def makeOwnEvent(self, sn, allowPartiallySigned=False):
serder, sigs, couple = self.getOwnEvent(sn=sn,
allowPartiallySigned=allowPartiallySigned)
msg.extend(serder.raw)
msg.extend(coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigs)).qb64b) # attach cnt
msg.extend(Counter(Codens.ControllerIdxSigs, count=len(sigs),
gvrsn=kering.Vrsn_1_0).qb64b) # attach cnt
for sig in sigs:
msg.extend(sig.qb64b) # attach sig

if couple is not None:
msg.extend(coring.Counter(code=coring.CtrDex.SealSourceCouples,
count=1).qb64b)
msg.extend(Counter(Codens.SealSourceCouples, count=1,
gvrsn=kering.Vrsn_1_0).qb64b)
msg.extend(couple)

return msg
Expand Down Expand Up @@ -2727,7 +2728,7 @@ def make(self, *, code=coring.MtrDex.Blake3_256, transferable=True, isith=None,
rmids=self.rmids)
self.save(habord)
self.prefixes.add(self.pre)

# during delegation initialization of a habitat we ignore the MissingDelegationError and
# MissingSignatureError
try:
Expand Down
7 changes: 4 additions & 3 deletions src/keri/app/indirecting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
from . import directing, storing, httping, forwarding, agenting, oobiing
from .habbing import GroupHab
from .. import help, kering
from ..core import eventing, parsing, routing, coring, serdering
from ..core import (eventing, parsing, routing, coring, serdering,
Counter, Codens)
from ..core.coring import Ilks
from ..db import basing, dbing
from ..end import ending
Expand Down Expand Up @@ -1142,8 +1143,8 @@ def on_get(self, req, rep):
said=said.decode("utf-8"))
rct = bytearray(rserder.raw)
if wigs := self.hab.db.getWigs(key=dgkey):
rct.extend(coring.Counter(code=coring.CtrDex.WitnessIdxSigs,
count=len(wigs)).qb64b)
rct.extend(Counter(Codens.CtrDex.WitnessIdxSigs, count=len(wigs),
gvrsn=kering.Vrsn_1_0).qb64b)
for wig in wigs:
rct.extend(wig)

Expand Down
65 changes: 30 additions & 35 deletions tests/core/test_delegating.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from keri import help

from keri import core
from keri import kering, core
from keri.core import coring, eventing, parsing

from keri.app import keeping, habbing
Expand Down Expand Up @@ -55,7 +55,8 @@ def test_delegation():
sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=verfers)

msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs, count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand Down Expand Up @@ -107,8 +108,8 @@ def test_delegation():

sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=bobK.verfers)
msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand All @@ -135,13 +136,13 @@ def test_delegation():
sigers = delMgr.sign(ser=delSrdr.raw, verfers=verfers)

msg = bytearray(delSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
counter = coring.Counter(code=coring.CtrDex.SealSourceCouples,
count=1)
counter = core.Counter(core.Codens.SealSourceCouples, count=1,
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
seqner = coring.Seqner(sn=bobK.sn)
msg.extend(seqner.qb64b)
Expand Down Expand Up @@ -201,8 +202,8 @@ def test_delegation():
sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=bobK.verfers)

msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand All @@ -229,13 +230,13 @@ def test_delegation():
sigers = delMgr.sign(ser=delSrdr.raw, verfers=verfers)

msg = bytearray(delSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
counter = coring.Counter(code=coring.CtrDex.SealSourceCouples,
count=1)
counter = core.Counter(core.Codens.SealSourceCouples, count=1,
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
seqner = coring.Seqner(sn=bobK.sn)
msg.extend(seqner.qb64b)
Expand Down Expand Up @@ -462,14 +463,7 @@ def test_load_event(mockHelpingNowUTC):
count = botHab.db.cntWigs(dbing.dgKey(botHab.pre, serder.said))
assert count >= 1



"""End Test"""





# This needs to be fixedup to actually test delegating superseding recovery
with (basing.openDB(name="bob") as bobDB,
keeping.openKS(name="bob") as bobKS,
basing.openDB(name="del") as delDB,
Expand Down Expand Up @@ -497,7 +491,8 @@ def test_load_event(mockHelpingNowUTC):
sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=verfers)

msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs, count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand Down Expand Up @@ -549,8 +544,8 @@ def test_load_event(mockHelpingNowUTC):

sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=bobK.verfers)
msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand All @@ -577,13 +572,13 @@ def test_load_event(mockHelpingNowUTC):
sigers = delMgr.sign(ser=delSrdr.raw, verfers=verfers)

msg = bytearray(delSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
counter = coring.Counter(code=coring.CtrDex.SealSourceCouples,
count=1)
counter = core.Counter(core.Codens.SealSourceCouples, count=1,
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
seqner = coring.Seqner(sn=bobK.sn)
msg.extend(seqner.qb64b)
Expand Down Expand Up @@ -643,8 +638,8 @@ def test_load_event(mockHelpingNowUTC):
sigers = bobMgr.sign(ser=bobSrdr.raw, verfers=bobK.verfers)

msg = bytearray(bobSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
Expand All @@ -671,13 +666,13 @@ def test_load_event(mockHelpingNowUTC):
sigers = delMgr.sign(ser=delSrdr.raw, verfers=verfers)

msg = bytearray(delSrdr.raw)
counter = coring.Counter(code=coring.CtrDex.ControllerIdxSigs,
count=len(sigers))
counter = core.Counter(core.Codens.ControllerIdxSigs, count=len(sigers),
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
for siger in sigers:
msg.extend(siger.qb64b)
counter = coring.Counter(code=coring.CtrDex.SealSourceCouples,
count=1)
counter = core.Counter(core.Codens.SealSourceCouples, count=1,
gvrsn=kering.Vrsn_1_0)
msg.extend(counter.qb64b)
seqner = coring.Seqner(sn=bobK.sn)
msg.extend(seqner.qb64b)
Expand Down

0 comments on commit f8420a3

Please sign in to comment.