Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/keri/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
messenger, messengerFrom, streamMessengerFrom,
httpClient, schemes)
from .apping import Consoler
from .challenging import ChallengeHandler, loadChallengingHandlers
from .challenging import ChallengeHandler
from .configing import openCF, Configer, ConfigerDoer
from .delegating import Anchorer, DelegateRequestHandler, delegateRequestExn
from .directing import Director, Reactor, Directant, Reactant, runController
from .forwarding import Poster, StreamPoster, ForwardHandler, introduce
from .grouping import (Counselor, MultisigNotificationHandler, multisigInceptExn, loadGroupingHandlers,
from .grouping import (Counselor, MultisigNotificationHandler, multisigInceptExn,
multisigRotateExn, multisigInteractExn, multisigRegistryInceptExn,
multisigIssueExn, multisigRevokeExn, multisigRpyExn,
multisigExn, getEscrowedEvent, Multiplexor)
Expand All @@ -32,12 +32,12 @@
KeeperDoer, Creator, RandyCreator, SaltyCreator,
Creatory, Initage, Manager, ManagerDoer, Algos)
from .notifying import notice, Notice, DicterSuber, Noter, Notifier
from .oobiing import (loadOobiingEnds, loadOobiingHandlers, OobiResource, OobiRequestHandler,
from .oobiing import (OobiResource, OobiRequestHandler,
oobiRequestExn, Oobiery, Authenticator, Result)
from .organizing import BaseOrganizer, Organizer, IdentifierOrganizer
from .querying import (QueryDoer, KeyStateNoticer, LogQuerier,
SeqNoQuerier, AnchorQuerier)
from .signaling import (signal, Signal, Signaler, loadSignalingEnds,
from .signaling import (signal, Signal, Signaler,
SignalsEnd, SignalIterable)
from .signing import serialize, signPaths, transSeal
from .specing import SpecResource
Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/challenging.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from ..core import Diger


def loadChallengingHandlers(db, signaler, exc):
def loadHandlers(db, signaler, exc):
""" Load handlers for the peer-to-peer challenge response protocol

Parameters:
Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def handle(self, serder, attachments=None):
self.mux.add(serder=serder)


def loadGroupingHandlers(exc, mux):
def loadHandlers(exc, mux):
""" Load handlers for the peer-to-peer distributed group multisig protocol

Parameters:
Expand Down
12 changes: 10 additions & 2 deletions src/keri/app/indirecting.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ..core import (Kevery, parsing, routing, coring, serdering,
Counter, receipt, Codens)
from ..db import BaserDoer
from ..end import loadEndingEnds
from ..end import loadEnds as loadEndingEnds
from ..help import nowUTC
from ..peer import Exchanger

Expand All @@ -34,7 +34,7 @@
from .httping import Clienter, createCESRRequest, parseCesrHttpRequest, CESR_CONTENT_TYPE
from .forwarding import ForwardHandler
from .agenting import httpClient
from .oobiing import Oobiery, loadOobiingEnds
from .oobiing import Oobiery, loadEnds as loadOobiingEnds

logger = ogler.getLogger()

Expand Down Expand Up @@ -905,6 +905,14 @@ def on_post(self, req, rep):
204:
description: KEL or EXN event accepted.
"""
if req.method == "OPTIONS":
rep.status = falcon.HTTP_200
return

rep.set_header('Cache-Control', "no-cache")
rep.set_header('connection', "close")

cr = parseCesrHttpRequest(req=req)
sadder = coring.Sadder(ked=cr.payload, kind=Kinds.json)
msg = bytearray(sadder.raw)
msg.extend(cr.attachments.encode("utf-8"))
Expand Down
4 changes: 2 additions & 2 deletions src/keri/app/oobiing.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
Result = Resultage(resolved='resolved', failed='failed')


def loadOobiingEnds(app, *, hby, prefix=""):
def loadEnds(app, *, hby, prefix=""):
oobiEnd = OobiResource(hby=hby)
app.add_route(prefix + "/oobi", oobiEnd)
return []


def loadOobiingHandlers(hby, exc, notifier):
def loadHandlers(hby, exc, notifier):
""" Load handlers for the peer-to-peer delegation protocols

Parameters:
Expand Down
2 changes: 1 addition & 1 deletion src/keri/app/signaling.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def expireDo(self, tymth=None, tock=0.0, **kwa):
yield self.tock


def loadSignalingEnds(app, *, signals=None):
def loadEnds(app, *, signals=None):
""" Load endpoints for agent to controller messages

Args:
Expand Down
6 changes: 3 additions & 3 deletions src/keri/cli/commands/challenge/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from hio.base import doing
from hio.help import ogler

from ....app import (MailboxDirector, Organizer, Signaler,
loadChallengingHandlers)
from ....app import MailboxDirector, Organizer, Signaler
from ....app.challenging import loadHandlers
from ....help import helping
from ....peer import Exchanger

Expand Down Expand Up @@ -71,7 +71,7 @@ def __init__(self, name, base, bran, words, generate, strength, out, signer):
self.org = Organizer(hby=self.hby)
signaler = Signaler()

loadChallengingHandlers(db=self.hby.db, signaler=signaler, exc=self.exc)
loadHandlers(db=self.hby.db, signaler=signaler, exc=self.exc)

self.mbd = MailboxDirector(hby=self.hby, topics=['/challenge'], exc=self.exc)

Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/ends/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
from ....kering import Vrsn_1_0, ConfigurationError
from ....app import (GroupHab, Multiplexor, MailboxDirector,
Poster, WitnessPublisher, Notifier,
loadGroupingHandlers, multisigRpyExn)
multisigRpyExn)
from ....app.grouping import loadHandlers

from ....core import Parser
from ....peer import Exchanger
Expand Down Expand Up @@ -62,7 +63,7 @@ def __init__(self, name, base, alias, bran, role, eid, timestamp=None):
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)

Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/ipex/admit.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from ....app import (Notifier, Organizer, GroupHab,
Multiplexor, MailboxDirector,
WitnessInquisitor, StreamPoster,
multisigExn, loadGroupingHandlers)
multisigExn)
from ....app.grouping import loadHandlers

from ....core import Parser, Sadder, Kevery
from ....peer import Exchanger, cloneMessage, serializeMessage
Expand Down Expand Up @@ -68,7 +69,7 @@ def __init__(self, name, alias, base, bran, said, message, timestamp ):
mux = Multiplexor(self.hby, notifier=notifier)

self.exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(self.exc, mux)
loadHandlers(self.exc, mux)
loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)

mbx = MailboxDirector(hby=self.hby,
Expand Down
7 changes: 4 additions & 3 deletions src/keri/cli/commands/ipex/grant.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
from ....kering import Vrsn_1_0
from ....app import (Notifier, StreamPoster, Organizer,
GroupHab, Multiplexor, MailboxDirector,
serialize, multisigExn, loadGroupingHandlers)
serialize, multisigExn)
from ....app.grouping import loadHandlers as loadGroupingHandlers

from ....core import coring, parsing, serdering
from ....peer import exchanging

from ....vc import ipexGrantExn
from ....vc.protocoling import loadHandlers as loadHandlersProtocoling
from ....vc.protocoling import loadHandlers as loadProtocolingHandlers

from ....vdr import credentialing

Expand Down Expand Up @@ -66,7 +67,7 @@ def __init__(self, name, alias, base, bran, said, recp, message, timestamp):

self.exc = exchanging.Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(self.exc, mux)
loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)
loadProtocolingHandlers(self.hby, exc=self.exc, notifier=notifier)

mbx = MailboxDirector(hby=self.hby,
topics=["/receipt", "/multisig", "/replay", "/credential"],
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/ipex/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
from .... import Vrsn_1_0
from ....app import (HaberyDoer, MailboxDirector, WitnessInquisitor,
Notifier, Multiplexor, Organizer,
Counselor, Poster, loadGroupingHandlers, multisigExn)
Counselor, Poster, multisigExn)
from ....app.grouping import loadHandlers

from ....core import Parser, Revery, SerderKERI, Sadder
from ....peer import Exchanger, cloneMessage, serializeMessage
Expand Down Expand Up @@ -76,7 +77,7 @@ def __init__(self, name, base, bran, auto=False):
version=Vrsn_1_0)

mux = Multiplexor(hby=self.hby, notifier=self.notifier)
loadGroupingHandlers(exc=self.exc, mux=mux)
loadHandlers(exc=self.exc, mux=mux)
self.counselor = Counselor(hby=self.hby)

self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=self.counselor)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/ipex/spurn.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
from ....kering import Vrsn_1_0
from ....app import (Notifier, StreamPoster, Organizer,
GroupHab, Multiplexor, MailboxDirector,
multisigExn, loadGroupingHandlers)
multisigExn)
from ....app.grouping import loadHandlers

from ....core import Kevery, Parser
from ....peer import Exchanger, cloneMessage
Expand Down Expand Up @@ -63,7 +64,7 @@ def __init__(self, name, alias, base, bran, said, message):
mux = Multiplexor(self.hby, notifier=notifier)

self.exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(self.exc, mux)
loadHandlers(self.exc, mux)
loadHandlersProtocoling(self.hby, exc=self.exc, notifier=notifier)

mbx = MailboxDirector(hby=self.hby,
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/location/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

from ....app import (GroupHab, Multiplexor, indirecting,
forwarding, WitnessPublisher, Notifier,
loadGroupingHandlers, multisigRpyExn)
multisigRpyExn)
from ....app.grouping import loadHandlers

from ....core import Parser
from ....peer import Exchanger
Expand Down Expand Up @@ -64,7 +65,7 @@ def __init__(self, name, base, alias, bran, url, eid, timestamp=None):
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbx = indirecting.MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)

Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/multisig/incept.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from ....kering import ConfigurationError
from ....app import (Notifier, MailboxDirector, Multiplexor,
Counselor, HaberyDoer, Poster,
loadGroupingHandlers, multisigInceptExn)
multisigInceptExn)
from ....app.grouping import loadHandlers
from ...common import Parsery, setupHby, printIdentifier
from ....core import Prefixer, Number, Diger
from ....peer import Exchanger
Expand Down Expand Up @@ -90,7 +91,7 @@ def __init__(self, name, base, alias, bran, group, wait, **kwa):
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

self.mbx = MailboxDirector(hby=self.hby, topics=topics, exc=exc)
self.counselor = Counselor(hby=self.hby)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/multisig/interact.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
from ....kering import ConfigurationError
from ....app import (Notifier, Multiplexor, Counselor,
MailboxDirector, HaberyDoer, Poster,
loadGroupingHandlers, multisigInteractExn)
multisigInteractExn)
from ....app.grouping import loadHandlers

from ....core import Prefixer, Number, Diger, SerderKERI
from ....peer import Exchanger
Expand Down Expand Up @@ -79,7 +80,7 @@ def __init__(self, name, alias, aids, base, bran, data):
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbd = MailboxDirector(hby=self.hby, topics=['/receipt', '/multisig'], exc=exc)
self.counselor = Counselor(hby=self.hby)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/multisig/join.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
Notifier, Multiplexor, Counselor, Organizer, Poster,
multisigInceptExn, multisigInteractExn, multisigRotateExn,
multisigRpyExn, multisigRegistryInceptExn, multisigIssueExn,
multisigRevokeExn, loadGroupingHandlers)
multisigRevokeExn)
from ....app.grouping import loadHandlers

from ....core import (Prefixer, Number, Diger, Tholder,
Schemer, Parser, Revery, SerderKERI,
Expand Down Expand Up @@ -89,7 +90,7 @@ def __init__(self, name, base, bran, group, auto=False):
version=Vrsn_1_0)

mux = Multiplexor(hby=self.hby, notifier=self.notifier)
loadGroupingHandlers(exc=self.exc, mux=mux)
loadHandlers(exc=self.exc, mux=mux)
self.counselor = Counselor(hby=self.hby)

self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=self.counselor)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/multisig/rotate.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
from ....kering import ConfigurationError
from ....app import (Notifier, Multiplexor, Counselor,
MailboxDirector, HaberyDoer, Poster,
loadGroupingHandlers, multisigRotateExn)
multisigRotateExn)
from ....app.grouping import loadHandlers

from ....core import Prefixer, Number, Diger, SerderKERI
from ....db import dgKey
Expand Down Expand Up @@ -90,7 +91,7 @@ def __init__(self, hby, alias, smids=None, rmids=None, isith=None, nsith=None,
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbd = MailboxDirector(hby=self.hby, topics=['/receipt', '/multisig', '/replay'], exc=exc)
self.counselor = Counselor(hby=self.hby)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/vc/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

from ....app import (MailboxDirector, HaberyDoer, GroupHab, Counselor,
Multiplexor, Organizer, Poster, Notifier,
serialize, loadGroupingHandlers, multisigIssueExn)
serialize, multisigIssueExn)
from ....app.grouping import loadHandlers

from ....core import (Prefixer, Number, Diger, SealEvent,
SerderKERI, SerderACDC, NumDex)
Expand Down Expand Up @@ -162,7 +163,7 @@ def __init__(self, name, alias, base, bran, registryName=None, schema=None, edge
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

self.verifier = Verifier(hby=self.hby, reger=self.rgy.reger)
mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/credential"],
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/vc/registry/incept.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

from .....app import (GroupHab, Notifier, MailboxDirector,
HaberyDoer, Multiplexor, Counselor,
Poster, loadGroupingHandlers, multisigRegistryInceptExn)
Poster, multisigRegistryInceptExn)
from .....app.grouping import loadHandlers

from .....core import SerderKERI, SealEvent
from .....peer import Exchanger
Expand Down Expand Up @@ -103,7 +104,7 @@ def __init__(self, name, base, alias, bran, registryName, nonce, estOnly, noBack
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/replay"], exc=exc)
self.registrar = Registrar(hby=self.hby, rgy=self.rgy, counselor=counselor)
Expand Down
5 changes: 3 additions & 2 deletions src/keri/cli/commands/vc/revoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
from ....kering import ValidationError, Ilks
from ....app import (MailboxDirector, HaberyDoer, Counselor,
Multiplexor, Poster, Organizer, Notifier,
GroupHab, multisigRevokeExn, loadGroupingHandlers)
GroupHab, multisigRevokeExn)
from ....app.grouping import loadHandlers

from ....core import SealEvent, Seqner, SerderKERI
from ....peer import Exchanger
Expand Down Expand Up @@ -60,7 +61,7 @@ def __init__(self, name, alias, said, base, bran, registryName, send, timestamp,
notifier = Notifier(self.hby)
mux = Multiplexor(self.hby, notifier=notifier)
exc = Exchanger(hby=self.hby, handlers=[])
loadGroupingHandlers(exc, mux)
loadHandlers(exc, mux)

mbx = MailboxDirector(hby=self.hby, topics=["/receipt", "/multisig", "/credential"],
verifier=self.verifier, exc=exc)
Expand Down
2 changes: 1 addition & 1 deletion src/keri/end/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .ending import (Signage, Inputage, signature,
designature, normalize, siginput,
desiginput, PointEnd, LocationEnd,
AdminEnd, OOBIEnd, loadEndingEnds, setup,
AdminEnd, OOBIEnd, loadEnds, setup,
OOBI_RE, DOOBI_RE, Mimes, KeriMimes,
WOOBI_RE, OOBI_AID_HEADER)
from .priming import parseArgs
Loading
Loading