Skip to content

Commit eeafb71

Browse files
authored
Change Sealer to Anchorer. Change import of Siger from keri (#225)
* changed interface import to keri for Siger to keri.core.Siger from keri.core.coring.Siger * Change Sealer to Anchorer
1 parent 5fdfebb commit eeafb71

File tree

9 files changed

+64
-55
lines changed

9 files changed

+64
-55
lines changed

src/keria/app/agenting.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@
99
from dataclasses import asdict
1010
from urllib.parse import urlparse, urljoin
1111

12-
from keri import kering
13-
from keri.app.notifying import Notifier
14-
from keri.app.storing import Mailboxer
1512

1613
import falcon
1714
from falcon import media
1815
from hio.base import doing
1916
from hio.core import http, tcp
2017
from hio.help import decking
18+
19+
from keri import kering
20+
from keri import core
21+
from keri.app.notifying import Notifier
22+
from keri.app.storing import Mailboxer
23+
24+
2125
from keri.app import configing, keeping, habbing, storing, signaling, oobiing, agenting, \
2226
forwarding, querying, connecting, grouping
2327
from keri.app.grouping import Counselor
@@ -149,7 +153,7 @@ def createHttpServer(port, app, keypath=None, certpath=None, cafilepath=None):
149153
class Agency(doing.DoDoer):
150154
"""
151155
Agency
152-
156+
153157
"""
154158

155159
def __init__(self, name, bran, base="", configFile=None, configDir=None, adb=None, temp=False):
@@ -287,7 +291,7 @@ def __init__(self, hby, rgy, agentHab, agency, caid, **opts):
287291
self.agency = agency
288292
self.caid = caid
289293

290-
self.swain = delegating.Sealer(hby=hby, proxy=agentHab)
294+
self.swain = delegating.Anchorer(hby=hby, proxy=agentHab)
291295
self.counselor = Counselor(hby=hby, swain=self.swain, proxy=agentHab)
292296
self.org = connecting.Organizer(hby=hby)
293297

@@ -814,7 +818,7 @@ def on_post(self, req, rep):
814818
if "sig" not in body:
815819
raise falcon.HTTPBadRequest(title="invalid inception",
816820
description=f'required field "sig" missing from body')
817-
siger = coring.Siger(qb64=body["sig"])
821+
siger = core.Siger(qb64=body["sig"])
818822

819823
caid = icp.pre
820824

src/keria/app/aiding.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import falcon
1212
from keri import kering
13+
from keri import core
1314
from keri.app import habbing
1415
from keri.app.keeping import Algos
1516
from keri.core import coring, serdering
@@ -161,11 +162,11 @@ def on_put(self, req, rep, caid):
161162
sigs = body["sigs"]
162163

163164
ctrlHab = agent.hby.habByName(caid, ns="agent")
164-
ctrlHab.rotate(serder=rot, sigers=[coring.Siger(qb64=sig) for sig in sigs])
165+
ctrlHab.rotate(serder=rot, sigers=[core.Siger(qb64=sig) for sig in sigs])
165166

166167
if not self.authn.verify(req):
167168
raise falcon.HTTPForbidden(description="invalid signature on request")
168-
169+
169170
sxlt = body["sxlt"]
170171
agent.mgr.sxlt = sxlt
171172

@@ -216,7 +217,7 @@ def interact(req, rep, agent, caid):
216217
ked = body['ixn']
217218
sigs = body['sigs']
218219
ixn = serdering.SerderKERI(sad=ked)
219-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
220+
sigers = [core.Siger(qb64=sig) for sig in sigs]
220221

221222
ctrlHab = agent.hby.habByName(caid, ns="agent")
222223

@@ -317,7 +318,7 @@ def on_post(req, rep):
317318

318319
serder = serdering.SerderKERI(sad=icp)
319320

320-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
321+
sigers = [core.Siger(qb64=sig) for sig in sigs]
321322

322323
if agent.hby.habByName(name) is not None:
323324
raise falcon.HTTPBadRequest(title=f"AID with name {name} already incepted")
@@ -545,7 +546,7 @@ def rotate(agent, name, body):
545546
hab = agent.hby.habByName(name)
546547
if hab is None:
547548
raise falcon.HTTPNotFound(title=f"No AID with name {name} found")
548-
549+
549550
rot = body.get("rot")
550551
if rot is None:
551552
raise falcon.HTTPBadRequest(title="invalid rotation",
@@ -563,7 +564,7 @@ def rotate(agent, name, body):
563564
description=f"required field 'sigs' missing from request")
564565

565566
serder = serdering.SerderKERI(sad=rot)
566-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
567+
sigers = [core.Siger(qb64=sig) for sig in sigs]
567568

568569
hab.rotate(serder=serder, sigers=sigers)
569570

@@ -629,7 +630,7 @@ def interact(agent, name, body):
629630
description=f"required field 'sigs' missing from request")
630631

631632
serder = serdering.SerderKERI(sad=ixn)
632-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
633+
sigers = [core.Siger(qb64=sig) for sig in sigs]
633634

634635
hab.interact(serder=serder, sigers=sigers)
635636

@@ -670,7 +671,7 @@ def info(hab, rm, full=False):
670671
data["state"] = asdict(kever.state())
671672
dgkey = dbing.dgKey(kever.prefixer.qb64b, kever.serder.saidb)
672673
wigs = hab.db.getWigs(dgkey)
673-
data["windexes"] = [coring.Siger(qb64b=bytes(wig)).index for wig in wigs]
674+
data["windexes"] = [core.Siger(qb64b=bytes(wig)).index for wig in wigs]
674675

675676
return data
676677

@@ -851,7 +852,7 @@ def on_post(req, rep, name, aid=None, role=None):
851852
raise falcon.errors.HTTPBadRequest(
852853
description=f"error trying to create end role for unknown local AID {pre}")
853854

854-
rsigers = [coring.Siger(qb64=rsig) for rsig in rsigs]
855+
rsigers = [core.Siger(qb64=rsig) for rsig in rsigs]
855856
tsg = (hab.kever.prefixer, coring.Seqner(sn=hab.kever.sn), coring.Saider(qb64=hab.kever.serder.said), rsigers)
856857
try:
857858
agent.hby.rvy.processReply(rserder, tsgs=[tsg])

src/keria/app/delegating.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from keri.db import dbing
66

77

8-
class Sealer(doing.DoDoer):
8+
class Anchorer(doing.DoDoer):
99
"""
1010
Sends messages to Delegator of an identifier and wait for the anchoring event to
1111
be processed to ensure the inception or rotation event has been approved by the delegator.
@@ -32,7 +32,7 @@ def __init__(self, hby, proxy=None, **kwa):
3232
self.witDoer = agenting.Receiptor(hby=self.hby)
3333
self.proxy = proxy
3434

35-
super(Sealer, self).__init__(doers=[self.witq, self.witDoer, self.postman, doing.doify(self.escrowDo)],
35+
super(Anchorer, self).__init__(doers=[self.witq, self.witDoer, self.postman, doing.doify(self.escrowDo)],
3636
**kwa)
3737

3838
def delegation(self, pre, sn=None, proxy=None):

src/keria/app/grouping.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import json
88

99
import falcon
10+
from keri import core
1011
from keri.app import habbing
1112
from keri.core import coring, eventing, serdering
1213
from keri.kering import SerializeError
@@ -56,7 +57,7 @@ def on_post(req, rep, name):
5657
atc = httping.getRequiredParam(body, "atc")
5758

5859
# create sigers from the edge signatures so we can messagize the whole thing
59-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
60+
sigers = [core.Siger(qb64=sig) for sig in sigs]
6061

6162
# create seal for the proper location to find the signatures
6263
kever = hab.mhab.kever
@@ -116,7 +117,7 @@ def on_post(req, rep, name):
116117
agent.hby.deleteHab(name=name)
117118
raise falcon.HTTPBadRequest(description=f"attempt to merge with unknown AID={recp}")
118119

119-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
120+
sigers = [core.Siger(qb64=sig) for sig in sigs]
120121
verfers = [coring.Verfer(qb64=k) for k in rot['k']]
121122
digers = [coring.Diger(qb64=n) for n in rot['n']]
122123

src/keria/app/ipexing.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import json
99

1010
import falcon
11+
from keri import core
1112
from keri.app import habbing
1213
from keri.core import coring, eventing, serdering
1314
from keri.peer import exchanging
@@ -46,7 +47,7 @@ def on_post(req, rep, name):
4647
- Registries
4748
responses:
4849
200:
49-
description: long running operation of IPEX admit
50+
description: long running operation of IPEX admit
5051
5152
"""
5253
agent = req.context.agent
@@ -83,7 +84,7 @@ def sendAdmit(agent, hab, ked, sigs, rec):
8384

8485
# use that data to create th Serder and Sigers for the exn
8586
serder = serdering.SerderKERI(sad=ked)
86-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
87+
sigers = [core.Siger(qb64=sig) for sig in sigs]
8788

8889
# Now create the stream to send, need the signer seal
8990
kever = hab.kever
@@ -122,7 +123,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
122123

123124
# use that data to create th Serder and Sigers for the exn
124125
serder = serdering.SerderKERI(sad=ked)
125-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
126+
sigers = [core.Siger(qb64=sig) for sig in sigs]
126127

127128
# Now create the stream to send, need the signer seal
128129
kever = hab.mhab.kever
@@ -210,7 +211,7 @@ def sendGrant(agent, hab, ked, sigs, atc, rec):
210211

211212
# use that data to create th Serder and Sigers for the exn
212213
serder = serdering.SerderKERI(sad=ked)
213-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
214+
sigers = [core.Siger(qb64=sig) for sig in sigs]
214215

215216
# Now create the stream to send, need the signer seal
216217
kever = hab.kever
@@ -246,7 +247,7 @@ def sendMultisigExn(agent, hab, ked, sigs, atc, rec):
246247

247248
# use that data to create th Serder and Sigers for the exn
248249
serder = serdering.SerderKERI(sad=ked)
249-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
250+
sigers = [core.Siger(qb64=sig) for sig in sigs]
250251

251252
# Now create the stream to send, need the signer seal
252253
kever = hab.mhab.kever
@@ -293,7 +294,7 @@ def on_post(req, rep, name):
293294
responses:
294295
200:
295296
description: long running operation of IPEX apply
296-
297+
297298
"""
298299
agent = req.context.agent
299300
# Get the hab
@@ -326,7 +327,7 @@ def sendApply(agent, hab, ked, sigs, rec):
326327

327328
# use that data to create th Serder and Sigers for the exn
328329
serder = serdering.SerderKERI(sad=ked)
329-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
330+
sigers = [core.Siger(qb64=sig) for sig in sigs]
330331

331332
# Now create the stream to send, need the signer seal
332333
kever = hab.kever
@@ -342,7 +343,7 @@ def sendApply(agent, hab, ked, sigs, rec):
342343
return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
343344

344345
class IpexOfferCollectionEnd:
345-
346+
346347
@staticmethod
347348
def on_post(req, rep, name):
348349
""" IPEX Offer POST endpoint
@@ -360,7 +361,7 @@ def on_post(req, rep, name):
360361
responses:
361362
200:
362363
description: long running operation of IPEX offer
363-
364+
364365
"""
365366
agent = req.context.agent
366367
hab = agent.hby.habByName(name)
@@ -393,7 +394,7 @@ def sendOffer(agent, hab, ked, sigs, atc, rec):
393394

394395
# use that data to create th Serder and Sigers for the exn
395396
serder = serdering.SerderKERI(sad=ked)
396-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
397+
sigers = [core.Siger(qb64=sig) for sig in sigs]
397398

398399
# Now create the stream to send, need the signer seal
399400
kever = hab.kever
@@ -407,9 +408,9 @@ def sendOffer(agent, hab, ked, sigs, atc, rec):
407408

408409
agent.exchanges.append(dict(said=serder.said, pre=hab.pre, rec=rec, topic='credential'))
409410
return agent.monitor.submit(serder.pre, longrunning.OpTypes.exchange, metadata=dict(said=serder.said))
410-
411+
411412
class IpexAgreeCollectionEnd:
412-
413+
413414
@staticmethod
414415
def on_post(req, rep, name):
415416
""" IPEX Agree POST endpoint
@@ -427,7 +428,7 @@ def on_post(req, rep, name):
427428
responses:
428429
200:
429430
description: long running operation of IPEX agree
430-
431+
431432
"""
432433
agent = req.context.agent
433434
hab = agent.hby.habByName(name)
@@ -459,7 +460,7 @@ def sendAgree(agent, hab, ked, sigs, rec):
459460

460461
# use that data to create th Serder and Sigers for the exn
461462
serder = serdering.SerderKERI(sad=ked)
462-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
463+
sigers = [core.Siger(qb64=sig) for sig in sigs]
463464

464465
# Now create the stream to send, need the signer seal
465466
kever = hab.kever

src/keria/core/longrunning.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Monitor:
8888
Attributes:
8989
hby (Habery): identifier database environment
9090
opr(Operator): long running operations database
91-
swain(Sealer): Delegation processes tracker
91+
swain(Anchorer): Delegation processes tracker
9292
9393
"""
9494

@@ -98,7 +98,7 @@ def __init__(self, hby, swain, counselor=None, registrar=None, exchanger=None, c
9898
9999
Parameters:
100100
hby (Habery): identifier database environment
101-
swain(Sealer): Delegation processes tracker
101+
swain(Anchorer): Delegation processes tracker
102102
opr (Operator): long running operations database
103103
104104
"""
@@ -410,8 +410,8 @@ def status(self, op):
410410
class OperationCollectionEnd:
411411
@staticmethod
412412
def on_get(req, rep):
413-
""" Get list of long running operations
414-
413+
""" Get list of long running operations
414+
415415
Parameters:
416416
req (Request): Falcon HTTP Request object
417417
rep (Response): Falcon HTTP Response object

src/keria/peer/exchanging.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import json
88

99
import falcon
10+
from keri import core
1011
from keri.core import coring, eventing, serdering
1112
from keri.peer import exchanging
1213

@@ -58,7 +59,7 @@ def on_post(req, rep, name):
5859

5960
# use that data to create th Serder and Sigers for the exn
6061
serder = serdering.SerderKERI(sad=ked)
61-
sigers = [coring.Siger(qb64=sig) for sig in sigs]
62+
sigers = [core.Siger(qb64=sig) for sig in sigs]
6263

6364
# Now create the stream to send, need the signer seal
6465
kever = hab.kever

0 commit comments

Comments
 (0)