clippy fixes

Author: QuantumExplorer

dash-spv-ffi/include/dash_spv_ffi.h

@@ -30,6 +30,25 @@ typedef enum FFIValidationMode {
  */
 typedef struct FFIDashSpvClient FFIDashSpvClient;
 
+/**
+ * FFI-safe array that transfers ownership of memory to the C caller.
+ *
+ * # Safety
+ *
+ * This struct represents memory that has been allocated by Rust but ownership
+ * has been transferred to the C caller. The caller is responsible for:
+ * - Not accessing the memory after it has been freed
+ * - Calling `dash_spv_ffi_array_destroy` to properly deallocate the memory
+ * - Ensuring the data, len, and capacity fields remain consistent
+ */
+typedef struct FFIArray {
+  void *data;
+  uintptr_t len;
+  uintptr_t capacity;
+  uintptr_t elem_size;
+  uintptr_t elem_align;
+} FFIArray;
+
 typedef ClientConfig FFIClientConfig;
 
 typedef struct FFIString {
@@ -129,25 +148,6 @@ typedef struct FFIEventCallbacks {
   void *user_data;
 } FFIEventCallbacks;
 
-/**
- * FFI-safe array that transfers ownership of memory to the C caller.
- *
- * # Safety
- *
- * This struct represents memory that has been allocated by Rust but ownership
- * has been transferred to the C caller. The caller is responsible for:
- * - Not accessing the memory after it has been freed
- * - Calling `dash_spv_ffi_array_destroy` to properly deallocate the memory
- * - Ensuring the data, len, and capacity fields remain consistent
- */
-typedef struct FFIArray {
-  void *data;
-  uintptr_t len;
-  uintptr_t capacity;
-  uintptr_t elem_size;
-  uintptr_t elem_align;
-} FFIArray;
-
 /**
  * Handle for Core SDK that can be passed to Platform SDK
  */
@@ -196,6 +196,49 @@ typedef struct FFIUnconfirmedTransaction {
   uintptr_t addresses_len;
 } FFIUnconfirmedTransaction;
 
+/**
+ * Get the latest checkpoint for the given network.
+ *
+ * # Safety
+ * - `out_height` must be a valid pointer to a `u32`.
+ * - `out_hash` must point to at least 32 writable bytes.
+ */
+int32_t dash_spv_ffi_checkpoint_latest(FFINetwork network, uint32_t *out_height, uint8_t *out_hash);
+
+/**
+ * Get the last checkpoint at or before a given height.
+ *
+ * # Safety
+ * - `out_height` must be a valid pointer to a `u32`.
+ * - `out_hash` must point to at least 32 writable bytes.
+ */
+int32_t dash_spv_ffi_checkpoint_before_height(FFINetwork network,
+                                              uint32_t height,
+                                              uint32_t *out_height,
+                                              uint8_t *out_hash);
+
+/**
+ * Get the last checkpoint at or before a given UNIX timestamp (seconds).
+ *
+ * # Safety
+ * - `out_height` must be a valid pointer to a `u32`.
+ * - `out_hash` must point to at least 32 writable bytes.
+ */
+int32_t dash_spv_ffi_checkpoint_before_timestamp(FFINetwork network,
+                                                 uint32_t timestamp,
+                                                 uint32_t *out_height,
+                                                 uint8_t *out_hash);
+
+/**
+ * Get all checkpoints between two heights (inclusive).
+ *
+ * Returns an `FFIArray` of `FFICheckpoint` items. The caller owns the memory and
+ * must free the array buffer using `dash_spv_ffi_array_destroy` when done.
+ */
+struct FFIArray dash_spv_ffi_checkpoints_between_heights(FFINetwork network,
+                                                         uint32_t start_height,
+                                                         uint32_t end_height);
+
 struct FFIDashSpvClient *dash_spv_ffi_client_new(const FFIClientConfig *config);
 
 /**
@@ -562,49 +605,6 @@ int32_t dash_spv_ffi_config_set_start_from_height(FFIClientConfig *config,
 int32_t dash_spv_ffi_config_set_wallet_creation_time(FFIClientConfig *config,
                                                      uint32_t timestamp);
 
-/**
- * Get the latest checkpoint for the given network.
- *
- * # Safety
- * - `out_height` must be a valid pointer to a `u32`.
- * - `out_hash` must point to at least 32 writable bytes.
- */
-int32_t dash_spv_ffi_checkpoint_latest(FFINetwork network, uint32_t *out_height, uint8_t *out_hash);
-
-/**
- * Get the last checkpoint at or before a given height.
- *
- * # Safety
- * - `out_height` must be a valid pointer to a `u32`.
- * - `out_hash` must point to at least 32 writable bytes.
- */
-int32_t dash_spv_ffi_checkpoint_before_height(FFINetwork network,
-                                              uint32_t height,
-                                              uint32_t *out_height,
-                                              uint8_t *out_hash);
-
-/**
- * Get the last checkpoint at or before a given UNIX timestamp (seconds).
- *
- * # Safety
- * - `out_height` must be a valid pointer to a `u32`.
- * - `out_hash` must point to at least 32 writable bytes.
- */
-int32_t dash_spv_ffi_checkpoint_before_timestamp(FFINetwork network,
-                                                 uint32_t timestamp,
-                                                 uint32_t *out_height,
-                                                 uint8_t *out_hash);
-
-/**
- * Get all checkpoints between two heights (inclusive).
- *
- * Returns an `FFIArray` of `FFICheckpoint` items. The caller owns the memory and
- * must free the array buffer using `dash_spv_ffi_array_destroy` when done.
- */
-struct FFIArray dash_spv_ffi_checkpoints_between_heights(FFINetwork network,
-                                                         uint32_t start_height,
-                                                         uint32_t end_height);
-
 const char *dash_spv_ffi_get_last_error(void);
 
 void dash_spv_ffi_clear_error(void);

dash-spv-ffi/src/checkpoints.rs

@@ -26,7 +26,7 @@ fn manager_for_network(network: FFINetwork) -> Result<CheckpointManager, String>
 /// - `out_height` must be a valid pointer to a `u32`.
 /// - `out_hash` must point to at least 32 writable bytes.
 #[no_mangle]
-pub extern "C" fn dash_spv_ffi_checkpoint_latest(
+pub unsafe extern "C" fn dash_spv_ffi_checkpoint_latest(
     network: FFINetwork,
     out_height: *mut u32,
     out_hash: *mut u8, // expects at least 32 bytes
@@ -43,11 +43,9 @@ pub extern "C" fn dash_spv_ffi_checkpoint_latest(
         }
     };
     if let Some(cp) = mgr.last_checkpoint() {
-        unsafe {
-            *out_height = cp.height;
-            let hash = cp.block_hash.to_byte_array();
-            std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
-        }
+        *out_height = cp.height;
+        let hash = cp.block_hash.to_byte_array();
+        std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
         FFIErrorCode::Success as i32
     } else {
         set_last_error("No checkpoints available for network");
@@ -61,7 +59,7 @@ pub extern "C" fn dash_spv_ffi_checkpoint_latest(
 /// - `out_height` must be a valid pointer to a `u32`.
 /// - `out_hash` must point to at least 32 writable bytes.
 #[no_mangle]
-pub extern "C" fn dash_spv_ffi_checkpoint_before_height(
+pub unsafe extern "C" fn dash_spv_ffi_checkpoint_before_height(
     network: FFINetwork,
     height: u32,
     out_height: *mut u32,
@@ -79,11 +77,9 @@ pub extern "C" fn dash_spv_ffi_checkpoint_before_height(
         }
     };
     if let Some(cp) = mgr.last_checkpoint_before_height(height) {
-        unsafe {
-            *out_height = cp.height;
-            let hash = cp.block_hash.to_byte_array();
-            std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
-        }
+        *out_height = cp.height;
+        let hash = cp.block_hash.to_byte_array();
+        std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
         FFIErrorCode::Success as i32
     } else {
         set_last_error("No checkpoint at or before given height");
@@ -97,7 +93,7 @@ pub extern "C" fn dash_spv_ffi_checkpoint_before_height(
 /// - `out_height` must be a valid pointer to a `u32`.
 /// - `out_hash` must point to at least 32 writable bytes.
 #[no_mangle]
-pub extern "C" fn dash_spv_ffi_checkpoint_before_timestamp(
+pub unsafe extern "C" fn dash_spv_ffi_checkpoint_before_timestamp(
     network: FFINetwork,
     timestamp: u32,
     out_height: *mut u32,
@@ -115,11 +111,9 @@ pub extern "C" fn dash_spv_ffi_checkpoint_before_timestamp(
         }
     };
     if let Some(cp) = mgr.last_checkpoint_before_timestamp(timestamp) {
-        unsafe {
-            *out_height = cp.height;
-            let hash = cp.block_hash.to_byte_array();
-            std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
-        }
+        *out_height = cp.height;
+        let hash = cp.block_hash.to_byte_array();
+        std::ptr::copy_nonoverlapping(hash.as_ptr(), out_hash, 32);
         FFIErrorCode::Success as i32
     } else {
         set_last_error("No checkpoint at or before given timestamp");