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

Hotfix: add type for recover, and some cleanups #260

Merged
merged 3 commits into from
Nov 25, 2020

Conversation

jsonsivar
Copy link
Contributor

Added the type field to the recover method and also updated the enum to be Google, Twitter, etc instead of Eth.

Copy link
Contributor

@perfectmak perfectmak left a comment

Choose a reason for hiding this comment

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

Generally looks good. I requested a change that you missed in the proto defintions.

@@ -584,6 +584,7 @@ message BackupKeysByPassphraseResponse {}
message RecoverKeysByPassphraseRequest {
string uuid = 1;
string passphrase = 2;
KeyBackupType type = 3;
Copy link
Contributor

Choose a reason for hiding this comment

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

You should also update the enum KeyBackupType definition of the proto file to contain the new fields

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, fixed in 8f5fafc

Copy link
Contributor

@maurycy maurycy left a comment

Choose a reason for hiding this comment

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

LGTM. 🚀

Copy link
Contributor

@perfectmak perfectmak left a comment

Choose a reason for hiding this comment

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

LGTM. There are some conflicts though.

@jsonsivar jsonsivar merged commit 5b732c1 into develop Nov 25, 2020
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.

4 participants