Merge branch 'downgrade-todo' into 'main'

keymgr: Remove/downgrade TODOs

See merge request tpo/core/arti!1285

crates/tor-keymgr/src/keystore.rs

@@ -15,7 +15,7 @@ pub type ErasedKey = Box<dyn Any>;
 
 /// A generic key store.
 //
-// TODO hs: eventually this will be able to store items that aren't keys (such as certificates and
+// TODO HSS: eventually this will be able to store items that aren't keys (such as certificates and
 // perhaps other types of sensitive data). We should consider renaming this (and other Key* types)
 // to something more generic (such as `SecretStore` or `Vault`).
 pub trait KeyStore: Send + Sync + 'static {

crates/tor-keymgr/src/keystore/arti.rs

@@ -30,7 +30,6 @@ impl ArtiNativeKeyStore {
         keystore_dir: impl AsRef<Path>,
         mistrust: &Mistrust,
     ) -> Result<Self> {
-        // TODO hs: this validation should be handled by `FsMgr`.
         let keystore_dir = mistrust
             .verifier()
             .check_content()

crates/tor-keymgr/src/mgr.rs

@@ -67,7 +67,7 @@ impl KeyMgr {
     // TODO hs: would it be useful for this API to return a Result<Option<K>> here (i.e. the old key)?
     // TODO HSS (#903): define what "key bundle" means
     pub fn insert<K: ToEncodableKey>(&self, key: K, key_spec: &dyn KeySpecifier) -> Result<()> {
-        // TODO hs: maybe we should designate an explicit 'primary' store instead of implicitly
+        // TODO HSS: maybe we should designate an explicit 'primary' store instead of implicitly
         // preferring the first one.
         let primary_store = match self.key_stores.first() {
             Some(store) => store,