app

commit e8a8695dde2300c340528fe33dc72047da8f53d6
parent c2b0085c490c235c88129e1e523905b293fc8785
Author: triesap <triesap@radroots.dev>
Date:   Tue, 20 Jan 2026 18:28:21 +0000

app: rename state/settings key helpers

- rename datastore key constants for settings/state
- rename obj key helpers to settings/state naming
- update config maps and exports for new constants
- keep stored key values unchanged

Diffstat:
M
app/src/bootstrap.rs
 | 
18
+++++++++---------
M
app/src/config.rs
 | 
32
++++++++++++++++----------------
M
app/src/lib.rs
 | 
8
++++----

3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/app/src/bootstrap.rs b/app/src/bootstrap.rs
@@ -3,8 +3,8 @@
 use radroots_app_core::datastore::{RadrootsClientDatastore, RadrootsClientDatastoreError};
 
 use crate::{
-    app_datastore_obj_key_cfg_data,
-    app_datastore_obj_key_app_data,
+    app_datastore_obj_key_settings,
+    app_datastore_obj_key_state,
     app_log_debug_emit,
     RadrootsAppState,
     RadrootsAppSettings,
@@ -18,7 +18,7 @@ pub async fn app_datastore_write_config<T: RadrootsClientDatastore>(
     key_maps: &RadrootsAppKeyMapConfig,
     data: &RadrootsAppSettings,
 ) -> RadrootsAppInitResult<RadrootsAppSettings> {
-    let key = app_datastore_obj_key_cfg_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let key = app_datastore_obj_key_settings(key_maps).map_err(RadrootsAppInitError::Config)?;
     let value = datastore
         .set_obj(key, data)
         .await
@@ -31,7 +31,7 @@ pub async fn app_datastore_has_config<T: RadrootsClientDatastore>(
     datastore: &T,
     key_maps: &RadrootsAppKeyMapConfig,
 ) -> RadrootsAppInitResult<bool> {
-    let key = app_datastore_obj_key_cfg_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let key = app_datastore_obj_key_settings(key_maps).map_err(RadrootsAppInitError::Config)?;
     match datastore.get_obj::<RadrootsAppSettings>(key).await {
         Ok(_) => Ok(true),
         Err(RadrootsClientDatastoreError::NoResult) => Ok(false),
@@ -44,7 +44,7 @@ pub async fn app_datastore_write_app_data<T: RadrootsClientDatastore>(
     key_maps: &RadrootsAppKeyMapConfig,
     data: &RadrootsAppState,
 ) -> RadrootsAppInitResult<RadrootsAppState> {
-    let key = app_datastore_obj_key_app_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let key = app_datastore_obj_key_state(key_maps).map_err(RadrootsAppInitError::Config)?;
     let value = datastore
         .set_obj(key, data)
         .await
@@ -57,7 +57,7 @@ pub async fn app_datastore_read_app_data<T: RadrootsClientDatastore>(
     datastore: &T,
     key_maps: &RadrootsAppKeyMapConfig,
 ) -> RadrootsAppInitResult<RadrootsAppState> {
-    let key = app_datastore_obj_key_app_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let key = app_datastore_obj_key_state(key_maps).map_err(RadrootsAppInitError::Config)?;
     let value = datastore
         .get_obj::<RadrootsAppState>(key)
         .await
@@ -70,7 +70,7 @@ pub async fn app_datastore_has_app_data<T: RadrootsClientDatastore>(
     datastore: &T,
     key_maps: &RadrootsAppKeyMapConfig,
 ) -> RadrootsAppInitResult<bool> {
-    let key = app_datastore_obj_key_app_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let key = app_datastore_obj_key_state(key_maps).map_err(RadrootsAppInitError::Config)?;
     match datastore.get_obj::<RadrootsAppState>(key).await {
         Ok(_) => Ok(true),
         Err(RadrootsClientDatastoreError::NoResult) => Ok(false),
@@ -82,12 +82,12 @@ pub async fn app_datastore_clear_bootstrap<T: RadrootsClientDatastore>(
     datastore: &T,
     key_maps: &RadrootsAppKeyMapConfig,
 ) -> RadrootsAppInitResult<()> {
-    let cfg_key = app_datastore_obj_key_cfg_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let cfg_key = app_datastore_obj_key_settings(key_maps).map_err(RadrootsAppInitError::Config)?;
     datastore
         .del_obj(cfg_key)
         .await
         .map_err(RadrootsAppInitError::Datastore)?;
-    let app_key = app_datastore_obj_key_app_data(key_maps).map_err(RadrootsAppInitError::Config)?;
+    let app_key = app_datastore_obj_key_state(key_maps).map_err(RadrootsAppInitError::Config)?;
     datastore
         .del_obj(app_key)
         .await
diff --git a/app/src/config.rs b/app/src/config.rs
@@ -16,8 +16,8 @@ pub type RadrootsAppKeystoreKeyMap = BTreeMap<&'static str, &'static str>;
 
 pub const APP_DATASTORE_KEY_NOSTR_KEY: &str = "nostr:key";
 pub const APP_DATASTORE_KEY_EULA_DATE: &str = "app:eula:date";
-pub const APP_DATASTORE_KEY_OBJ_CFG_DATA: &str = "cfg:data";
-pub const APP_DATASTORE_KEY_OBJ_APP_DATA: &str = "app:data";
+pub const APP_DATASTORE_KEY_OBJ_SETTINGS: &str = "cfg:data";
+pub const APP_DATASTORE_KEY_OBJ_STATE: &str = "app:data";
 pub const APP_DATASTORE_KEY_LOG_ENTRY: &str = "log:entry";
 pub const APP_KEYSTORE_KEY_NOSTR_DEFAULT: &str = "nostr:default";
 
@@ -62,8 +62,8 @@ pub fn app_key_maps_default() -> RadrootsAppKeyMapConfig {
     );
     param_map.insert("log_entry", app_datastore_param_log_entry as RadrootsAppDatastoreKeyParam);
     let mut obj_map = BTreeMap::new();
-    obj_map.insert("cfg_data", APP_DATASTORE_KEY_OBJ_CFG_DATA);
-    obj_map.insert("app_data", APP_DATASTORE_KEY_OBJ_APP_DATA);
+    obj_map.insert("cfg_data", APP_DATASTORE_KEY_OBJ_SETTINGS);
+    obj_map.insert("app_data", APP_DATASTORE_KEY_OBJ_STATE);
     RadrootsAppKeyMapConfig {
         key_map,
         param_map,
@@ -170,11 +170,11 @@ pub fn app_datastore_key_eula_date(config: &RadrootsAppKeyMapConfig) -> Radroots
     app_datastore_key(config, "eula_date")
 }
 
-pub fn app_datastore_obj_key_cfg_data(config: &RadrootsAppKeyMapConfig) -> RadrootsAppConfigResult<&'static str> {
+pub fn app_datastore_obj_key_settings(config: &RadrootsAppKeyMapConfig) -> RadrootsAppConfigResult<&'static str> {
     app_datastore_obj_key(config, "cfg_data")
 }
 
-pub fn app_datastore_obj_key_app_data(config: &RadrootsAppKeyMapConfig) -> RadrootsAppConfigResult<&'static str> {
+pub fn app_datastore_obj_key_state(config: &RadrootsAppKeyMapConfig) -> RadrootsAppConfigResult<&'static str> {
     app_datastore_obj_key(config, "app_data")
 }
 
@@ -291,8 +291,8 @@ mod tests {
         app_datastore_param_log_entry,
         app_datastore_key_eula_date,
         app_datastore_key_nostr_key,
-        app_datastore_obj_key_app_data,
-        app_datastore_obj_key_cfg_data,
+        app_datastore_obj_key_state,
+        app_datastore_obj_key_settings,
         app_key_maps_validate,
         app_keystore_key_maps_default,
         app_keystore_key_maps_validate,
@@ -310,8 +310,8 @@ mod tests {
         RadrootsAppKeystoreKeyMap,
         APP_DATASTORE_KEY_EULA_DATE,
         APP_DATASTORE_KEY_NOSTR_KEY,
-        APP_DATASTORE_KEY_OBJ_APP_DATA,
-        APP_DATASTORE_KEY_OBJ_CFG_DATA,
+        APP_DATASTORE_KEY_OBJ_STATE,
+        APP_DATASTORE_KEY_OBJ_SETTINGS,
         APP_DATASTORE_KEY_LOG_ENTRY,
         APP_KEYSTORE_KEY_NOSTR_DEFAULT,
     };
@@ -394,11 +394,11 @@ mod tests {
         );
         assert_eq!(
             config.obj_map.get("cfg_data"),
-            Some(&APP_DATASTORE_KEY_OBJ_CFG_DATA)
+            Some(&APP_DATASTORE_KEY_OBJ_SETTINGS)
         );
         assert_eq!(
             config.obj_map.get("app_data"),
-            Some(&APP_DATASTORE_KEY_OBJ_APP_DATA)
+            Some(&APP_DATASTORE_KEY_OBJ_STATE)
         );
         assert_eq!(app_datastore_param_nostr_profile("abc"), "nostr:abc:profile");
         assert_eq!(
@@ -439,12 +439,12 @@ mod tests {
             APP_DATASTORE_KEY_EULA_DATE
         );
         assert_eq!(
-            app_datastore_obj_key_cfg_data(&config).expect("cfg key"),
-            APP_DATASTORE_KEY_OBJ_CFG_DATA
+            app_datastore_obj_key_settings(&config).expect("cfg key"),
+            APP_DATASTORE_KEY_OBJ_SETTINGS
         );
         assert_eq!(
-            app_datastore_obj_key_app_data(&config).expect("app key"),
-            APP_DATASTORE_KEY_OBJ_APP_DATA
+            app_datastore_obj_key_state(&config).expect("app key"),
+            APP_DATASTORE_KEY_OBJ_STATE
         );
         let nostr_param = app_datastore_param_key(&config, "nostr_profile").expect("param");
         assert_eq!(nostr_param("abc"), "nostr:abc:profile");
diff --git a/app/src/lib.rs b/app/src/lib.rs
@@ -97,8 +97,8 @@ pub use config::{
     app_datastore_param_radroots_profile,
     app_datastore_param_key,
     app_datastore_obj_key,
-    app_datastore_obj_key_app_data,
-    app_datastore_obj_key_cfg_data,
+    app_datastore_obj_key_state,
+    app_datastore_obj_key_settings,
     app_assets_geocoder_db_url,
     app_assets_sql_wasm_url,
     app_keystore_key_maps_default,
@@ -122,8 +122,8 @@ pub use config::{
     APP_DATASTORE_KEY_EULA_DATE,
     APP_DATASTORE_KEY_LOG_ENTRY,
     APP_DATASTORE_KEY_NOSTR_KEY,
-    APP_DATASTORE_KEY_OBJ_APP_DATA,
-    APP_DATASTORE_KEY_OBJ_CFG_DATA,
+    APP_DATASTORE_KEY_OBJ_STATE,
+    APP_DATASTORE_KEY_OBJ_SETTINGS,
     APP_KEYSTORE_KEY_NOSTR_DEFAULT,
 };
 pub use init::{