Simplify map_or_log_err
All (non-test) invocations use the same second argument `Ok` (which
actually acts as a 1-arg closure `|v| Ok(v)`), so no need to have it as
a parameter. The common second argument just maps `Ok(v)` to `Ok(v)`,
which means that `map_err()` can be used instead of `map_or_else()`,
and the same type parameter is used for both input and output.
Test: legacykeystore_test
Test: keystore2_test
Flag: None, pure refactor
Change-Id: I46b6e327d0b546df6be6664781a52bb888c04eca
diff --git a/keystore2/src/km_compat.rs b/keystore2/src/km_compat.rs
index 03c9d02..02bcb1a 100644
--- a/keystore2/src/km_compat.rs
+++ b/keystore2/src/km_compat.rs
@@ -226,7 +226,7 @@
) -> binder::Result<KeyCreationResult> {
if self.emu.emulation_required(key_params, &KeyImportData::None) {
let mut result = self.soft.generateKey(key_params, attestation_key)?;
- result.keyBlob = map_or_log_err(wrap_keyblob(&result.keyBlob), Ok)?;
+ result.keyBlob = map_or_log_err(wrap_keyblob(&result.keyBlob))?;
Ok(result)
} else {
self.real.generateKey(key_params, attestation_key)
@@ -242,7 +242,7 @@
if self.emu.emulation_required(key_params, &KeyImportData::new(key_format, key_data)?) {
let mut result =
self.soft.importKey(key_params, key_format, key_data, attestation_key)?;
- result.keyBlob = map_or_log_err(wrap_keyblob(&result.keyBlob), Ok)?;
+ result.keyBlob = map_or_log_err(wrap_keyblob(&result.keyBlob))?;
Ok(result)
} else {
self.real.importKey(key_params, key_format, key_data, attestation_key)
@@ -281,7 +281,7 @@
KeyBlob::Wrapped(keyblob) => {
// Re-wrap the upgraded keyblob.
let upgraded_keyblob = self.soft.upgradeKey(keyblob, upgrade_params)?;
- map_or_log_err(wrap_keyblob(&upgraded_keyblob), Ok)
+ map_or_log_err(wrap_keyblob(&upgraded_keyblob))
}
}
}