Fix linting

Cargo.toml

@@ -16,3 +16,4 @@ thiserror = "1.0.50"
 http-std = { git = "https://github.com/TBD54566975/web5-rs", rev = "005bd3c04574039ad7c3e41eeefae877b9895104" }
 web5 = { git = "https://github.com/TBD54566975/web5-rs", rev = "005bd3c04574039ad7c3e41eeefae877b9895104" }
 web5_uniffi_wrapper = { git = "https://github.com/TBD54566975/web5-rs", rev = "005bd3c04574039ad7c3e41eeefae877b9895104" }
+

bindings/tbdex_wasm/Cargo.toml

@@ -19,4 +19,4 @@ web5 = { workspace = true }
 web-sys = { version = "0.3.70", features = ["console"] }
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib"]

bindings/tbdex_wasm/src/errors.rs

@@ -28,7 +28,7 @@ impl WasmTbdexError {
 
     #[wasm_bindgen(getter)]
     pub fn is_web5_error(&self) -> bool {
-        self.is_tbdex_error.clone()
+        self.is_tbdex_error
     }
 }
 

bindings/tbdex_wasm/src/foreign_fetch.rs

@@ -28,14 +28,14 @@ unsafe impl Sync for ConcreteForeignFetch {}
 
 impl Client for ConcreteForeignFetch {
     fn fetch(&self, url: &str, options: Option<FetchOptions>) -> http_std::Result<Response> {
-        let wasm_options = options.and_then(|o| Some(WasmFetchOptions::from(o)));
+        let wasm_options = options.map(WasmFetchOptions::from);
         let wasm_response = self.0.fetch(url, wasm_options);
         Ok(wasm_response.into())
     }
 }
 
 #[wasm_bindgen]
-pub fn set_http_client(foreign_fetch: ForeignFetch) -> () {
+pub fn set_http_client(foreign_fetch: ForeignFetch) {
     http_std::set_client(Arc::new(ConcreteForeignFetch(foreign_fetch)))
 }
 
@@ -68,12 +68,10 @@ fn method_from_str(method: &str) -> Result<Method> {
         "GET" => Ok(Method::Get),
         "POST" => Ok(Method::Post),
         "PUT" => Ok(Method::Put),
-        _ => {
-            return Err(map_err(TbdexError::HttpClient(format!(
-                "unknown method {}",
-                method
-            ))))
-        }
+        _ => Err(map_err(TbdexError::HttpClient(format!(
+            "unknown method {}",
+            method
+        )))),
     }
 }
 
@@ -108,7 +106,7 @@ impl WasmFetchOptions {
 
     #[wasm_bindgen(getter)]
     pub fn method(&self) -> Option<String> {
-        self.inner.method.as_ref().and_then(|m| Some(m.to_string()))
+        self.inner.method.as_ref().map(|m| m.to_string())
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/cancel.rs

@@ -34,7 +34,7 @@ impl WasmCancel {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -54,12 +54,12 @@ impl WasmCancel {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/close.rs

@@ -34,7 +34,7 @@ impl WasmClose {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -54,12 +54,12 @@ impl WasmClose {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/mod.rs

@@ -5,9 +5,9 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 pub mod cancel;
 pub mod close;
+pub mod order;
 pub mod order_instructions;
 pub mod order_status;
-pub mod order;
 pub mod quote;
 pub mod rfq;
 
@@ -30,6 +30,7 @@ impl From<WasmMessageMetadata> for MessageMetadata {
 
 #[wasm_bindgen]
 impl WasmMessageMetadata {
+    #[allow(clippy::too_many_arguments)]
     #[wasm_bindgen(constructor)]
     pub fn new(
         from: String,

bindings/tbdex_wasm/src/messages/order.rs

@@ -34,7 +34,7 @@ impl WasmOrder {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -52,12 +52,12 @@ impl WasmOrder {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]
@@ -102,3 +102,9 @@ impl WasmOrderData {
         }
     }
 }
+
+impl Default for WasmOrderData {
+    fn default() -> Self {
+        Self::new()
+    }
+}

bindings/tbdex_wasm/src/messages/order_instructions.rs

@@ -38,7 +38,7 @@ impl WasmOrderInstructions {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -65,12 +65,12 @@ impl WasmOrderInstructions {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/order_status.rs

@@ -39,7 +39,7 @@ impl WasmOrderStatus {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -60,12 +60,12 @@ impl WasmOrderStatus {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/quote.rs

@@ -34,7 +34,7 @@ impl WasmQuote {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -54,12 +54,12 @@ impl WasmQuote {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/messages/rfq.rs

@@ -45,7 +45,7 @@ impl WasmRfq {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -70,30 +70,29 @@ impl WasmRfq {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify_offering_requirements(&self, offering: WasmOffering) -> Result<()> {
-        Ok(self
-            .inner
+        self.inner
             .verify_offering_requirements(&offering.into())
-            .map_err(map_err)?)
+            .map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify_all_private_data(&self) -> Result<()> {
-        Ok(self.inner.verify_all_private_data().map_err(map_err)?)
+        self.inner.verify_all_private_data().map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify_present_private_data(&self) -> Result<()> {
-        Ok(self.inner.verify_present_private_data().map_err(map_err)?)
+        self.inner.verify_present_private_data().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/resources/balance.rs

@@ -34,7 +34,7 @@ impl WasmBalance {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     #[wasm_bindgen]
@@ -50,12 +50,12 @@ impl WasmBalance {
 
     #[wasm_bindgen]
     pub fn sign(&mut self, bearer_did: WasmBearerDid) -> Result<()> {
-        Ok(self.inner.sign(&bearer_did.into()).map_err(map_err)?)
+        self.inner.sign(&bearer_did.into()).map_err(map_err)
     }
 
     #[wasm_bindgen]
     pub fn verify(&self) -> Result<()> {
-        Ok(self.inner.verify().map_err(map_err)?)
+        self.inner.verify().map_err(map_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/resources/offering.rs

@@ -43,7 +43,7 @@ impl WasmOffering {
     }
 
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_err)?)
+        self.inner.to_json_string().map_err(map_err)
     }
 
     pub fn create(
@@ -114,7 +114,7 @@ impl WasmOfferingData {
                 payout_units_per_payin_unit,
                 payin: payin.into(),
                 payout: payout.into(),
-                required_claims: required_claims.and_then(|rc| Some(rc.into())),
+                required_claims: required_claims.map(|rc| rc.into()),
                 cancellation: cancellation.into(),
             },
         }
@@ -232,6 +232,7 @@ impl From<PayinMethod> for WasmPayinMethod {
 
 #[wasm_bindgen]
 impl WasmPayinMethod {
+    #[allow(clippy::too_many_arguments)]
     #[wasm_bindgen(constructor)]
     pub fn new(
         kind: String,
@@ -387,6 +388,7 @@ impl From<PayoutMethod> for WasmPayoutMethod {
 
 #[wasm_bindgen]
 impl WasmPayoutMethod {
+    #[allow(clippy::too_many_arguments)]
     #[wasm_bindgen(constructor)]
     pub fn new(
         kind: String,

bindings/tbdex_wasm/src/web5/did.rs

@@ -22,6 +22,7 @@ impl From<Did> for WasmDid {
 
 #[wasm_bindgen]
 impl WasmDid {
+    #[allow(clippy::too_many_arguments)]
     #[wasm_bindgen(constructor)]
     pub fn new(
         uri: String,

bindings/tbdex_wasm/src/web5/document.rs

@@ -27,6 +27,7 @@ impl From<Document> for WasmDocument {
 
 #[wasm_bindgen]
 impl WasmDocument {
+    #[allow(clippy::too_many_arguments)]
     #[wasm_bindgen(constructor)]
     pub fn new(
         id: String,
@@ -56,10 +57,7 @@ impl WasmDocument {
                 key_agreement,
                 capability_invocation,
                 capability_delegation,
-                service: match service {
-                    None => None,
-                    Some(wss) => Some(wss.into_iter().map(|ws| ws.into()).collect()),
-                },
+                service: service.map(|wss| wss.into_iter().map(|ws| ws.into()).collect()),
             },
         }
     }
@@ -73,7 +71,7 @@ impl WasmDocument {
 
     #[wasm_bindgen]
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_web5_err)?)
+        self.inner.to_json_string().map_err(map_web5_err)
     }
 
     #[wasm_bindgen(getter)]

bindings/tbdex_wasm/src/web5/portable_did.rs

@@ -45,7 +45,7 @@ impl WasmPortableDid {
 
     #[wasm_bindgen]
     pub fn to_json_string(&self) -> Result<String> {
-        Ok(self.inner.to_json_string().map_err(map_web5_err)?)
+        self.inner.to_json_string().map_err(map_web5_err)
     }
 
     #[wasm_bindgen(getter)]