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.

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

Consolidate module & manager into single contract #26

Merged
merged 4 commits into from
Aug 1, 2024

Conversation

JohnGuilding
Copy link
Collaborator

No description provided.

@JohnGuilding JohnGuilding force-pushed the feat/add-custom-error-arguments branch from 0b5121f to a388fff Compare August 1, 2024 09:28
@JohnGuilding JohnGuilding marked this pull request as ready for review August 1, 2024 09:28
@JohnGuilding JohnGuilding force-pushed the feat/consolidate-module-and-manager branch from 5486f12 to e5f23f5 Compare August 1, 2024 09:38
Base automatically changed from feat/add-custom-error-arguments to main August 1, 2024 13:42
src/EmailRecoveryManager.sol Show resolved Hide resolved
// This check ensures GuardianStatus is correct and also implicitly that the
// account in email is a valid account
GuardianStorage memory guardianStorage = getGuardian(account, guardian);
if (guardianStorage.status != GuardianStatus.REQUESTED) {
revert InvalidGuardianStatus(guardianStorage.status, GuardianStatus.REQUESTED);
}

guardiansStorage.updateGuardianStatus(account, guardian, GuardianStatus.ACCEPTED);
updateGuardianStatus(account, guardian, GuardianStatus.ACCEPTED);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer this

src/GuardianManager.sol Show resolved Hide resolved
@JohnGuilding JohnGuilding merged commit 32809e8 into main Aug 1, 2024
4 checks passed
@JohnGuilding JohnGuilding deleted the feat/consolidate-module-and-manager branch August 1, 2024 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants