fixup! feat(truapi-platform): add host capability traits

Author: pgherveou

rust/crates/truapi-platform/src/lib.rs

@@ -31,40 +31,67 @@ use url::Url;
 pub struct RuntimeConfig {
     /// Canonical product identifier used for account derivation.
     pub product_id: String,
+    /// Host metadata shown by the wallet during SSO pairing.
+    pub host_info: HostInfo,
+    /// Platform metadata shown by the wallet during SSO pairing.
+    pub platform_info: PlatformInfo,
+    /// People-chain genesis hash used for statement-store SSO.
+    pub people_chain_genesis_hash: [u8; 32],
+    /// Deeplink URI scheme used in pairing QR payloads, without `://`.
+    pub pairing_deeplink_scheme: String,
+}
+
+/// Host metadata shown by the wallet during SSO pairing.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct HostInfo {
     /// Host name shown by the wallet during SSO pairing.
-    pub host_name: String,
+    pub name: String,
     /// Optional host icon URL/CID shown by the wallet during SSO pairing.
-    pub host_icon: Option<String>,
+    pub icon: Option<String>,
     /// Optional host version shown by the wallet during SSO pairing.
-    pub host_version: Option<String>,
+    pub version: Option<String>,
+}
+
+/// Platform metadata shown by the wallet during SSO pairing.
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+pub struct PlatformInfo {
     /// Optional platform/browser name shown by the wallet during SSO pairing.
-    pub platform_type: Option<String>,
+    pub kind: Option<String>,
     /// Optional platform/browser version shown by the wallet during SSO pairing.
-    pub platform_version: Option<String>,
-    /// People-chain genesis hash used for statement-store SSO.
-    pub people_chain_genesis_hash: [u8; 32],
-    /// Deeplink URI scheme used in pairing QR payloads, without `://`.
-    pub pairing_deeplink_scheme: String,
+    pub version: Option<String>,
 }
 
 impl RuntimeConfig {
     /// Build a runtime config, validating fields whose representation cannot
     /// be made invalid by Rust types alone.
-    pub fn new(config: Self) -> Result<Self, RuntimeConfigValidationError> {
+    pub fn new(
+        product_id: String,
+        host_info: HostInfo,
+        platform_info: PlatformInfo,
+        people_chain_genesis_hash: [u8; 32],
+        pairing_deeplink_scheme: String,
+    ) -> Result<Self, RuntimeConfigValidationError> {
+        let config = Self {
+            product_id,
+            host_info,
+            platform_info,
+            people_chain_genesis_hash,
+            pairing_deeplink_scheme,
+        };
         config.validate()?;
         Ok(config)
     }
 
     fn validate(&self) -> Result<(), RuntimeConfigValidationError> {
         require_non_empty("product_id", &self.product_id)?;
-        require_non_empty("host_name", &self.host_name)?;
+        require_non_empty("host_info.name", &self.host_info.name)?;
         require_non_empty("pairing_deeplink_scheme", &self.pairing_deeplink_scheme)?;
         if self.pairing_deeplink_scheme.contains("://") {
             return Err(RuntimeConfigValidationError::InvalidDeeplinkScheme {
                 scheme: self.pairing_deeplink_scheme.clone(),
             });
         }
-        if let Some(icon) = &self.host_icon {
+        if let Some(icon) = &self.host_info.icon {
             let parsed =
                 Url::parse(icon).map_err(|err| RuntimeConfigValidationError::InvalidHostIcon {
                     reason: err.to_string(),
@@ -96,13 +123,13 @@ pub enum RuntimeConfigValidationError {
         field: &'static str,
     },
     /// Host icon URL could not be parsed as an absolute URL.
-    #[display("host_icon must be an absolute HTTPS URL: {reason}")]
+    #[display("host_info.icon must be an absolute HTTPS URL: {reason}")]
     InvalidHostIcon {
         /// Parse failure reason.
         reason: String,
     },
     /// Host icon URL used a non-HTTPS scheme.
-    #[display("host_icon must use https scheme, got {scheme:?}")]
+    #[display("host_info.icon must use https scheme, got {scheme:?}")]
     InsecureHostIcon {
         /// Actual URL scheme.
         scheme: String,

rust/crates/truapi-platform/tests/bounds.rs

@@ -4,7 +4,9 @@
 //! `impl Future`); the runtime consumes implementors via generics, not
 //! `dyn Trait`.
 
-use truapi_platform::{Platform, RuntimeConfig, RuntimeConfigValidationError};
+use truapi_platform::{
+    HostInfo, Platform, PlatformInfo, RuntimeConfig, RuntimeConfigValidationError,
+};
 
 fn _assert_platform_bounds<T: Platform + Send + Sync + 'static>() {}
 
@@ -44,7 +46,9 @@ fn runtime_config_validation_cases() {
             host_name: " ",
             host_icon: Some("https://dot.li/dotli.png"),
             pairing_deeplink_scheme: "polkadotapp",
-            expected: Err(RuntimeConfigValidationError::EmptyField { field: "host_name" }),
+            expected: Err(RuntimeConfigValidationError::EmptyField {
+                field: "host_info.name",
+            }),
         },
         TestCase {
             name: "rejects relative host icon",
@@ -79,16 +83,17 @@ fn runtime_config_validation_cases() {
     ];
 
     for case in cases {
-        let result = RuntimeConfig::new(RuntimeConfig {
-            product_id: case.product_id.to_string(),
-            host_name: case.host_name.to_string(),
-            host_icon: case.host_icon.map(str::to_string),
-            host_version: None,
-            platform_type: None,
-            platform_version: None,
-            people_chain_genesis_hash: [0xa2; 32],
-            pairing_deeplink_scheme: case.pairing_deeplink_scheme.to_string(),
-        })
+        let result = RuntimeConfig::new(
+            case.product_id.to_string(),
+            HostInfo {
+                name: case.host_name.to_string(),
+                icon: case.host_icon.map(str::to_string),
+                version: None,
+            },
+            PlatformInfo::default(),
+            [0xa2; 32],
+            case.pairing_deeplink_scheme.to_string(),
+        )
         .map(|_| ());
         assert_eq!(result, case.expected, "{}", case.name);
     }