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 444d1f6..6f817be 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,13 +422,13 @@ 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) creator = keeping.SaltyCreator(salt=salter.qb64, stem="signify:aid", tier=coring.Tiers.low) encrypter = core.Encrypter(verkey=signers[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 rsigners = creator.create(pidx=pidx, ridx=ridx, tier=coring.Tiers.low, temp=False, count=1) rnsigners = creator.create(pidx=pidx, ridx=ridx+1, tier=coring.Tiers.low, temp=False, count=1) @@ -468,7 +468,7 @@ def createAid(client, name, salt, wits=None, toad="0", delpre=None): salter = core.Salter(raw=salt) encrypter = core.Encrypter(verkey=signers[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] diff --git a/tests/app/test_aiding.py b/tests/app/test_aiding.py index ec81c8b..4e7f387 100644 --- a/tests/app/test_aiding.py +++ b/tests/app/test_aiding.py @@ -293,7 +293,7 @@ def test_identifier_collection_end(helpers): salter = core.Salter(raw=salt) encrypter = core.Encrypter(verkey=signers[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 body = {'name': 'aid1', 'icp': serder.ked, @@ -782,8 +782,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, @@ -872,8 +872,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, @@ -913,7 +913,7 @@ def test_identifier_collection_end(helpers): salter = core.Salter(raw=salt) encrypter = core.Encrypter(verkey=signers[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] @@ -1307,7 +1307,7 @@ def test_identifier_resource_end(helpers): sigers = [signer.sign(ser=serder.raw, index=0).qb64 for signer in signers] salter = core.Salter(raw=salt) encrypter = core.Encrypter(verkey=signers[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 body = {'name': 'aid1', 'icp': serder.ked, @@ -1589,7 +1589,7 @@ def test_rotation(helpers): salter = core.Salter(raw=salt) encrypter = core.Encrypter(verkey=signers1[0].verfer.qb64) - sxlt = encrypter.encrypt(salter.qb64).qb64 + sxlt = encrypter.encrypt(ser=salter.qb64).qb64 bodyid1 = {'name': 'aid1', 'icp': serder1.ked, @@ -1707,4 +1707,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