Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix clear revocation logic #2956

Merged
merged 4 commits into from
May 21, 2024
Merged

Fix clear revocation logic #2956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afee1e0
Fix clear revocation logic
jamshale May 16, 2024
72508a4
Merge branch 'main' into feat/2932
jamshale May 21, 2024
63e5afb
Merge branch 'main' into feat/2932
jamshale May 21, 2024
76d8e28
Merge branch 'main' into feat/2932
jamshale May 21, 2024
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
5 changes: 3 additions & 2 deletions aries_cloudagent/revocation/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,11 @@ async def clear_pending_revocations(
async with self._profile.transaction() as txn:
issuer_rr_recs = await IssuerRevRegRecord.query_by_pending(txn)
for issuer_rr_rec in issuer_rr_recs:
if purge and issuer_rr_rec.revoc_reg_id not in purge:
continue
rrid = issuer_rr_rec.revoc_reg_id
await issuer_rr_rec.clear_pending(txn, (purge or {}).get(rrid))
if issuer_rr_rec.pending_pub:
result[rrid] = issuer_rr_rec.pending_pub
result[rrid] = issuer_rr_rec.pending_pub
notify.append(rrid)
await txn.commit()

Expand Down
75 changes: 48 additions & 27 deletions aries_cloudagent/revocation/tests/test_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,18 +619,17 @@ async def test_publish_pending_revocations_1_rev_reg_some(self):
mock_issuer_rev_reg_records[1].clear_pending.assert_not_called()

async def test_clear_pending(self):
REV_REG_ID_2 = f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2"
mock_issuer_rev_reg_records = [
mock.MagicMock(
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID,
tails_local_path=TAILS_LOCAL,
pending_pub=[],
clear_pending=mock.CoroutineMock(),
pending_pub=["1", "2"],
),
mock.MagicMock(
revoc_reg_id=f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2",
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID_2,
tails_local_path=TAILS_LOCAL,
pending_pub=[],
clear_pending=mock.CoroutineMock(),
pending_pub=["9", "99"],
),
]
with mock.patch.object(
Expand All @@ -639,47 +638,45 @@ async def test_clear_pending(self):
mock.CoroutineMock(return_value=mock_issuer_rev_reg_records),
) as record:
result = await self.manager.clear_pending_revocations()
assert result == {}
assert result[REV_REG_ID] == []
assert result[REV_REG_ID_2] == []

async def test_clear_pending_1_rev_reg_all(self):
REV_REG_ID_2 = f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2"

mock_issuer_rev_reg_records = [
mock.MagicMock(
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID,
tails_local_path=TAILS_LOCAL,
pending_pub=["1", "2"],
clear_pending=mock.CoroutineMock(),
),
mock.MagicMock(
revoc_reg_id=f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2",
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID_2,
tails_local_path=TAILS_LOCAL,
pending_pub=["9", "99"],
clear_pending=mock.CoroutineMock(),
),
]
with mock.patch.object(
test_module.IssuerRevRegRecord,
"query_by_pending",
mock.CoroutineMock(return_value=mock_issuer_rev_reg_records),
) as record:
result = await self.manager.clear_pending_revocations({REV_REG_ID: None})
assert result == {
REV_REG_ID: ["1", "2"],
f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2": ["9", "99"],
}
result = await self.manager.clear_pending_revocations({REV_REG_ID: []})
assert result[REV_REG_ID] == []
assert result.get(REV_REG_ID_2) is None

async def test_clear_pending_1_rev_reg_some(self):
REV_REG_ID_2 = f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2"
mock_issuer_rev_reg_records = [
mock.MagicMock(
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID,
tails_local_path=TAILS_LOCAL,
pending_pub=["1", "2"],
clear_pending=mock.CoroutineMock(),
),
mock.MagicMock(
revoc_reg_id=f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2",
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID_2,
tails_local_path=TAILS_LOCAL,
pending_pub=["99"],
clear_pending=mock.CoroutineMock(),
),
]
with mock.patch.object(
Expand All @@ -688,10 +685,34 @@ async def test_clear_pending_1_rev_reg_some(self):
mock.CoroutineMock(return_value=mock_issuer_rev_reg_records),
) as record:
result = await self.manager.clear_pending_revocations({REV_REG_ID: ["9"]})
assert result == {
REV_REG_ID: ["1", "2"],
f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2": ["99"],
}

assert result[REV_REG_ID] == ["1", "2"]
assert result.get(REV_REG_ID_2) is None

async def test_clear_pending_both(self):
REV_REG_ID_2 = f"{TEST_DID}:4:{CRED_DEF_ID}:CL_ACCUM:tag2"
mock_issuer_rev_reg_records = [
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID,
tails_local_path=TAILS_LOCAL,
pending_pub=["1", "2"],
),
test_module.IssuerRevRegRecord(
revoc_reg_id=REV_REG_ID_2,
tails_local_path=TAILS_LOCAL,
pending_pub=["99"],
),
]
with mock.patch.object(
test_module.IssuerRevRegRecord,
"query_by_pending",
mock.CoroutineMock(return_value=mock_issuer_rev_reg_records),
) as record:
result = await self.manager.clear_pending_revocations(
{REV_REG_ID: ["1"], REV_REG_ID_2: ["99"]}
)
assert result[REV_REG_ID] == ["2"]
assert result[REV_REG_ID_2] == []

async def test_retrieve_records(self):
session = await self.profile.session()
Expand Down