mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-14 19:16:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(crypto): Merge matches and reflow comments in accept_secret

Browse Source
This commit is contained in:
Jonas Platte
2022-11-04 12:09:37 +01:00
committed by Jonas Platte
parent db5d34e385
commit cf241d8c32
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
crates/matrix-sdk-crypto/src/gossiping/machine.rs
View File

@@ -751,29 +751,23 @@ impl GossipMachine {
if secret_name != &SecretName::RecoveryKey {
match self.store.import_secret(secret_name, &event.content.secret).await {
Ok(_) => self.mark_as_done(request).await?,
// If this is a store error propagate it up the call stack.
Err(SecretImportError::Store(e)) => return Err(e),
// Otherwise warn that there was something wrong with the
// secret.
Err(e) => {
// If this is a store error propagate it up
// the call stack.
if let SecretImportError::Store(e) = e {
return Err(e);
} else {
// Otherwise warn that there was
// something wrong with the secret.
warn!(
secret_name = secret_name.as_ref(),
error = ?e,
"Error while importing a secret"
)
}
warn!(
secret_name = secret_name.as_ref(),
error = ?e,
"Error while importing a secret"
);
}
}
} else {
// Skip importing the recovery key here since
// we'll want to check if the public key matches
// to the latest version on the server. The key
// will not be zeroized and
// instead leave the key in the event and let
// the user import it later.
// Skip importing the recovery key here since we'll want to check
// if the public key matches to the latest version on the server.
// The key will not be zeroized and instead leave the key in the
// event and let the user import it later.
}
Ok(())