diff --git a/setup.py b/setup.py index c85d794..38b7b4b 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ python_requires='>=3.12.2', install_requires=[ 'hio>=0.6.14', - 'keri==1.2.0.dev11', + 'keri==1.2.0.dev13', 'mnemonic>=0.21', 'multicommand>=1.0.0', 'falcon>=3.1.3', diff --git a/src/keria/app/indirecting.py b/src/keria/app/indirecting.py index 7ff53c1..2ba6c75 100644 --- a/src/keria/app/indirecting.py +++ b/src/keria/app/indirecting.py @@ -9,7 +9,7 @@ from keri.app import httping from keri.core import eventing from keri.core.coring import Ilks, Sadder -from keri.kering import Protocols +from keri.kering import Protocols, Kinds CESR_DESTINATION_HEADER = "CESR-DESTINATION" @@ -78,7 +78,7 @@ def on_post(self, req, rep): rep.set_header('connection', "close") cr = httping.parseCesrHttpRequest(req=req) - serder = Sadder(ked=cr.payload, kind=eventing.Serials.json) + serder = Sadder(ked=cr.payload, kind=Kinds.json) msg = bytearray(serder.raw) msg.extend(cr.attachments.encode("utf-8")) diff --git a/src/keria/testing/testing_helper.py b/src/keria/testing/testing_helper.py index 2b8b48a..2337be4 100644 --- a/src/keria/testing/testing_helper.py +++ b/src/keria/testing/testing_helper.py @@ -374,9 +374,9 @@ def inceptRandy(bran, count=1, sith="1", wits=None, toad="0"): creator = keeping.RandyCreator() signers = creator.create(count=count) - prxs = [encrypter.encrypt(matter=signer).qb64 for signer in signers] + prxs = [encrypter.encrypt(prim=signer).qb64 for signer in signers] nsigners = creator.create(count=count) - nxts = [encrypter.encrypt(matter=signer).qb64 for signer in nsigners] + nxts = [encrypter.encrypt(prim=signer).qb64 for signer in nsigners] keys = [signer.verfer.qb64 for signer in signers] ndigs = [coring.Diger(ser=nsigner.verfer.qb64b) for nsigner in nsigners] @@ -422,7 +422,7 @@ def interact(pre, bran, pidx, ridx, sn, dig, data): signers = creator.create(pidx=pidx, ridx=ridx, tier=coring.Tiers.low, temp=False, count=1) sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] return serder, sigers - + @staticmethod def createRotate(aid, salt, signers, pidx, ridx, kidx, wits, toad): salter = core.Salter(raw=salt) diff --git a/tests/app/test_aiding.py b/tests/app/test_aiding.py index dc4a378..031e4e6 100644 --- a/tests/app/test_aiding.py +++ b/tests/app/test_aiding.py @@ -793,8 +793,8 @@ def test_identifier_collection_end(helpers): ndigs=[diger.qb64 for diger in ndigs]) sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] - prxs = [encrypter.encrypt(matter=signer).qb64 for signer in signers] - nxts = [encrypter.encrypt(matter=signer).qb64 for signer in nsigners] + prxs = [encrypter.encrypt(prim=signer).qb64 for signer in signers] + nxts = [encrypter.encrypt(prim=signer).qb64 for signer in nsigners] body = {'rot': serder.ked, 'sigs': sigers, @@ -883,8 +883,8 @@ def test_identifier_collection_end(helpers): ) sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] - prxs = [encrypter.encrypt(matter=signer).qb64 for signer in signers] - nxts = [encrypter.encrypt(matter=signer).qb64 for signer in nsigners] + prxs = [encrypter.encrypt(prim=signer).qb64 for signer in signers] + nxts = [encrypter.encrypt(prim=signer).qb64 for signer in nsigners] body = {'rot': serder.ked, 'sigs': sigers, @@ -1722,4 +1722,4 @@ def test_rotation(helpers): # rotate aid3 body = helpers.createRotate(aid=aid3, salt=salt, signers=signers3, pidx=3, ridx=1, kidx=3, wits=wits3, toad=toad3) res = client.simulate_post(path=f"/identifiers/{aid3['name']}/events", body=json.dumps(body)) - assert res.status_code == 200 \ No newline at end of file + assert res.status_code == 200