fix: duplicate structs after merge conflicts

Author: shumkov

packages/wasm-sdk/src/dpns.rs

@@ -119,83 +119,6 @@ fn parse_dpns_usernames_query(
     })
 }
 
-const DEFAULT_DPNS_USERNAMES_LIMIT: u32 = 10;
-
-fn resolve_dpns_usernames_limit(limit: Option<u32>) -> u32 {
-    match limit {
-        Some(0) | None => DEFAULT_DPNS_USERNAMES_LIMIT,
-        Some(value) => value,
-    }
-}
-
-fn usernames_from_documents(documents_result: Documents) -> Array {
-    let usernames_array = Array::new();
-    for (_, doc_opt) in documents_result {
-        if let Some(doc) = doc_opt {
-            let properties = doc.properties();
-            if let (Some(Value::Text(label)), Some(Value::Text(parent_domain))) = (
-                properties.get("label"),
-                properties.get("normalizedParentDomainName"),
-            ) {
-                let username = format!("{}.{}", label, parent_domain);
-                usernames_array.push(&JsValue::from(username));
-            }
-        }
-    }
-    usernames_array
-}
-
-// TS definition for DpnsUsernamesQuery used by getDpnsUsernames*
-#[wasm_bindgen(typescript_custom_section)]
-const DPNS_USERNAMES_QUERY_TS: &'static str = r#"
-/**
- * Query parameters for retrieving DPNS usernames.
- */
-export interface DpnsUsernamesQuery {
-  /**
-   * Identity to fetch usernames for.
-   */
-  identityId: IdentifierLike;
-
-  /**
-   * Maximum number of usernames to return. Use 0 for default.
-   * @default 10
-   */
-  limit?: number;
-}
-"#;
-
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(typescript_type = "DpnsUsernamesQuery")]
-    pub type DpnsUsernamesQueryJs;
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct DpnsUsernamesQueryInput {
-    identity_id: IdentifierWasm,
-    #[serde(default)]
-    limit: Option<u32>,
-}
-
-struct DpnsUsernamesQueryParsed {
-    identity_id: Identifier,
-    limit: Option<u32>,
-}
-
-fn parse_dpns_usernames_query(
-    query: DpnsUsernamesQueryJs,
-) -> Result<DpnsUsernamesQueryParsed, WasmSdkError> {
-    let input: DpnsUsernamesQueryInput =
-        deserialize_required_query(query, "Query object is required", "DPNS usernames query")?;
-
-    Ok(DpnsUsernamesQueryParsed {
-        identity_id: input.identity_id.into(),
-        limit: input.limit,
-    })
-}
-
 #[wasm_bindgen(js_name = "DpnsUsernamesProofResponse")]
 #[derive(Clone)]
 pub struct DpnsUsernamesProofResponseWasm {
@@ -398,7 +321,10 @@ impl WasmSdk {
     }
 
     #[wasm_bindgen(js_name = "getDpnsUsernameByName")]
-    pub async fn get_dpns_username_by_name(&self, username: &str) -> Result<DpnsUsernameInfo, WasmSdkError> {
+    pub async fn get_dpns_username_by_name(
+        &self,
+        username: &str,
+    ) -> Result<DpnsUsernameInfo, WasmSdkError> {
         const DPNS_CONTRACT_ID: &str = "GWRSAVFMjXx8HpQFaNJMqBV7MBgMK4br5UESsB4S31Ec";
         const DPNS_DOCUMENT_TYPE: &str = "domain";
 
@@ -521,10 +447,7 @@ impl WasmSdk {
         }
     }
 
-    #[wasm_bindgen(
-        js_name = "getDpnsUsernames",
-        unchecked_return_type = "Array<string>"
-    )]
+    #[wasm_bindgen(js_name = "getDpnsUsernames", unchecked_return_type = "Array<string>")]
     pub async fn get_dpns_usernames(
         &self,
         query: DpnsUsernamesQueryJs,

packages/wasm-sdk/src/queries/document.rs

@@ -486,9 +486,8 @@ impl WasmSdk {
         let (document_result, metadata, proof) =
             Document::fetch_with_metadata_and_proof(self.as_ref(), query, None).await?;
 
-        let document_js = document_result.map(|doc| {
-            DocumentWasm::from_batch(doc, contract_id, document_type.to_string(), None)
-        });
+        let document_js = document_result
+            .map(|doc| DocumentWasm::from_batch(doc, contract_id, document_type.to_string(), None));
 
         Ok(ProofMetadataResponseWasm::from_parts(
             JsValue::from(document_js),

packages/wasm-sdk/src/queries/identity.rs

@@ -194,7 +194,6 @@ impl IdentityNonceWasm {
         BigInt::from(self.nonce)
     }
 }
-
 #[wasm_bindgen(typescript_custom_section)]
 const IDENTITIES_CONTRACT_KEYS_QUERY_TS: &'static str = r#"
 /**
@@ -218,54 +217,13 @@ export interface IdentitiesContractKeysQuery {
   purposes?: number[];
 }
 "#;
-#[wasm_bindgen]
-extern "C" {
-    #[wasm_bindgen(typescript_type = "IdentitiesContractKeysQuery")]
-    pub type IdentitiesContractKeysQueryJs;
-}
-#[derive(Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct IdentitiesContractKeysQueryInput {
-    #[serde(rename = "identityIds")]
-    identity_ids: Vec<IdentifierWasm>,
-    #[serde(rename = "contractId")]
-    contract_id: IdentifierWasm,
-    #[serde(default)]
-    purposes: Option<Vec<u32>>,
-}
-struct IdentitiesContractKeysQueryParsed {
-    identity_ids: Vec<Identifier>,
-    contract_id: Identifier,
-    purposes: Option<Vec<u32>>,
-}
-#[wasm_bindgen(typescript_custom_section)]
-const IDENTITIES_CONTRACT_KEYS_QUERY_TS: &'static str = r#"
-/**
- * Query parameters for fetching identities' public keys for a contract.
- */
-export interface IdentitiesContractKeysQuery {
-  /**
-   * Identity identifiers to fetch keys for.
-   */
-  identityIds: Array<IdentifierLike>;
-
-  /**
-   * Data contract identifier (reserved for future filtering).
-   */
-  contractId: IdentifierLike;
 
-  /**
-   * Optional list of purposes to include.
-   * @default undefined
-   */
-  purposes?: number[];
-}
-"#;
 #[wasm_bindgen]
 extern "C" {
     #[wasm_bindgen(typescript_type = "IdentitiesContractKeysQuery")]
     pub type IdentitiesContractKeysQueryJs;
 }
+
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct IdentitiesContractKeysQueryInput {
@@ -276,11 +234,13 @@ struct IdentitiesContractKeysQueryInput {
     #[serde(default)]
     purposes: Option<Vec<u32>>,
 }
+
 struct IdentitiesContractKeysQueryParsed {
     identity_ids: Vec<Identifier>,
     contract_id: Identifier,
     purposes: Option<Vec<u32>>,
 }
+
 fn parse_identities_contract_keys_query(
     query: IdentitiesContractKeysQueryJs,
 ) -> Result<IdentitiesContractKeysQueryParsed, WasmSdkError> {
@@ -299,6 +259,7 @@ fn parse_identities_contract_keys_query(
         purposes: input.purposes,
     })
 }
+
 #[wasm_bindgen(typescript_custom_section)]
 const IDENTITY_KEYS_QUERY_TS: &'static str = r#"
 /**

packages/wasm-sdk/src/queries/voting/resources.rs

@@ -204,7 +204,10 @@ fn parse_vote_polls_by_document_type_query(
 
 #[wasm_bindgen]
 impl WasmSdk {
-    #[wasm_bindgen(js_name = "getContestedResources", unchecked_return_type = "Array<any>")]
+    #[wasm_bindgen(
+        js_name = "getContestedResources",
+        unchecked_return_type = "Array<any>"
+    )]
     pub async fn get_contested_resources(
         &self,
         query: VotePollsByDocumentTypeQueryJs,

packages/wasm-sdk/src/wallet/key_derivation.rs

@@ -543,7 +543,11 @@ impl WasmSdk {
         account: u32,
         index: u32,
     ) -> DerivationPathWasm {
-        DerivationPathWasm::from(DerivationPath::new_dip9_mainnet(feature_type, account, index))
+        DerivationPathWasm::from(DerivationPath::new_dip9_mainnet(
+            feature_type,
+            account,
+            index,
+        ))
     }
 
     /// Create a DIP9 testnet derivation path
@@ -553,7 +557,11 @@ impl WasmSdk {
         account: u32,
         index: u32,
     ) -> DerivationPathWasm {
-        DerivationPathWasm::from(DerivationPath::new_dip9_testnet(feature_type, account, index))
+        DerivationPathWasm::from(DerivationPath::new_dip9_testnet(
+            feature_type,
+            account,
+            index,
+        ))
     }
 
     /// Create a DIP13 mainnet derivation path (for HD masternode keys)