Fix RustCrypto.resetEncryption failure
#4772
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1466,6 +1466,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH | |
| await this.backupManager.deleteAllKeyBackupVersions(); | ||
|
|
||
| this.deleteSecretStorage(); | ||
| await this.deleteSecretStorage(); | ||
|
Comment on lines
1468
to
+1469
There was a problem hiding this comment. @florianduros: Why do we need to do There was a problem hiding this comment. Oh, an error during the rebase. Good spot, I'll fix it tomorrow There was a problem hiding this comment. Removed in #4789 |
||
|
|
||
| // Reset the cross-signing keys | ||
| await this.crossSigningIdentity.bootstrapCrossSigning({ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you update the test so this would be caught by it please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is difficult because we are using a mocked SecretStorage which is way faster than the real execution. Meaning that even by adding
jest.fn().mockResolvedValue(undefined)tostoreorsetDefaultKeyId, the test passes. Also I don't think that adding manual latency is a good thing neither.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I'd prefer the change to
mockResolvedValuefor async methods, even if it doesn't make the test fail. Personally I would add a small delay that makes the test fail but I definitely won't insist on that.I'll tick the PR and you can use your judgement. Thank you!