Skip to content

Commit dd7d074

Browse files
remove session usage, redundant error handling
Signed-off-by: Andrew Whitehead <cywolf@gmail.com>
1 parent 7b1b69c commit dd7d074

1 file changed

Lines changed: 33 additions & 40 deletions

File tree

aries_cloudagent/revocation/routes.py

Lines changed: 33 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,16 +1337,13 @@ async def on_revocation_registry_event(profile: Profile, event: Event):
13371337
profile,
13381338
f"{tails_base_url}/{registry_record.revoc_reg_id}",
13391339
)
1340-
async with profile.session() as session:
1341-
rev_reg_resp = await registry_record.send_def(
1342-
session.profile,
1343-
write_ledger=write_ledger,
1344-
endorser_did=endorser_did,
1345-
)
1346-
except RevocationError as e:
1347-
raise RevocationError(e.message) from e
1348-
except RevocationNotSupportedError as e:
1349-
raise RevocationNotSupportedError(reason=e.message) from e
1340+
rev_reg_resp = await registry_record.send_def(
1341+
profile,
1342+
write_ledger=write_ledger,
1343+
endorser_did=endorser_did,
1344+
)
1345+
except RevocationError:
1346+
raise
13501347

13511348
if not create_transaction_for_endorser:
13521349
meta_data = event.payload
@@ -1384,19 +1381,18 @@ async def on_revocation_registry_event(profile: Profile, event: Event):
13841381
except (StorageError, TransactionManagerError) as err:
13851382
raise TransactionManagerError(reason=err.roll_up) from err
13861383

1387-
async with profile.session() as session:
1388-
responder = session.inject_or(BaseResponder)
1389-
if responder:
1390-
await responder.send(
1391-
revo_transaction_request,
1392-
connection_id=connection.connection_id,
1393-
)
1394-
else:
1395-
LOGGER.warning(
1396-
"Configuration has no BaseResponder: cannot update "
1397-
"revocation on cred def %s",
1398-
cred_def_id,
1399-
)
1384+
responder = profile.inject_or(BaseResponder)
1385+
if responder:
1386+
await responder.send(
1387+
revo_transaction_request,
1388+
connection_id=connection.connection_id,
1389+
)
1390+
else:
1391+
LOGGER.warning(
1392+
"Configuration has no BaseResponder: cannot update "
1393+
"revocation on cred def %s",
1394+
cred_def_id,
1395+
)
14001396

14011397

14021398
async def on_revocation_entry_event(profile: Profile, event: Event):
@@ -1429,10 +1425,8 @@ async def on_revocation_entry_event(profile: Profile, event: Event):
14291425
write_ledger=write_ledger,
14301426
endorser_did=endorser_did,
14311427
)
1432-
except RevocationError as e:
1433-
raise RevocationError(e.message) from e
1434-
except RevocationNotSupportedError as e:
1435-
raise RevocationError(e.message) from e
1428+
except RevocationError:
1429+
raise
14361430

14371431
if not create_transaction_for_endorser:
14381432
meta_data = event.payload
@@ -1468,19 +1462,18 @@ async def on_revocation_entry_event(profile: Profile, event: Event):
14681462
except (StorageError, TransactionManagerError) as err:
14691463
raise RevocationError(err.roll_up) from err
14701464

1471-
async with profile.session() as session:
1472-
responder = session.inject_or(BaseResponder)
1473-
if responder:
1474-
await responder.send(
1475-
revo_transaction_request,
1476-
connection_id=connection.connection_id,
1477-
)
1478-
else:
1479-
LOGGER.warning(
1480-
"Configuration has no BaseResponder: cannot update "
1481-
"revocation on cred def %s",
1482-
event.payload["endorser"]["cred_def_id"],
1483-
)
1465+
responder = profile.inject_or(BaseResponder)
1466+
if responder:
1467+
await responder.send(
1468+
revo_transaction_request,
1469+
connection_id=connection.connection_id,
1470+
)
1471+
else:
1472+
LOGGER.warning(
1473+
"Configuration has no BaseResponder: cannot update "
1474+
"revocation on cred def %s",
1475+
event.payload["endorser"]["cred_def_id"],
1476+
)
14841477

14851478

14861479
async def on_revocation_tails_file_event(profile: Profile, event: Event):

0 commit comments

Comments
 (0)