Remove info, add height and hash queries

Author: sedited

libbitcoinkernel-sys/src/lib.rs

@@ -628,8 +628,8 @@ unsafe impl Send for BlockIndex<'_> {}
 unsafe impl Sync for BlockIndex<'_> {}
 
 #[derive(Debug, Clone)]
-pub struct BlockIndexInfo {
-    pub height: i32,
+pub struct BlockHash {
+    pub hash: [u8; 32],
 }
 
 impl<'a> BlockIndex<'a> {
@@ -645,12 +645,16 @@ impl<'a> BlockIndex<'a> {
         })
     }
 
-    pub fn info(&self) -> BlockIndexInfo {
-        let info = unsafe { kernel_get_block_index_info(self.inner) };
-        let res = BlockIndexInfo {
-            height: unsafe { (*info).height },
+    pub fn height(&self) -> i32 {
+        unsafe { kernel_block_index_get_height(self.inner) }
+    }
+
+    pub fn info(&self) -> BlockHash {
+        let hash = unsafe { kernel_block_index_get_block_hash(self.inner) };
+        let res = BlockHash {
+            hash: unsafe { (&*hash).hash },
         };
-        unsafe { kernel_block_index_info_destroy(info) };
+        unsafe { kernel_block_hash_destroy(hash) };
         return res;
     }
 }
@@ -912,8 +916,8 @@ impl<'a> ChainstateManager<'a> {
         })
     }
 
-    pub fn get_block_index_by_hash(&self, hash: [u8; 32]) -> Result<BlockIndex, KernelError> {
-        let mut block_hash = kernel_BlockHash { hash };
+    pub fn get_block_index_by_hash(&self, hash: BlockHash) -> Result<BlockIndex, KernelError> {
+        let mut block_hash = kernel_BlockHash { hash: hash.hash };
         let inner = unsafe {
             kernel_get_block_index_by_hash(self.context.inner, self.inner, &mut block_hash)
         };

src/main.rs

@@ -171,7 +171,7 @@ fn scan_txs(chainman: &ChainstateManager) {
     let (receiver, secret_scan_key) = parse_keys();
     let mut block_index = chainman.get_block_index_tip();
     loop {
-        if block_index.info().height <= 1 {
+        if block_index.height() <= 1 {
             break;
         }
         let undo = chainman.read_undo_data(&block_index).unwrap();

tests/test.rs

@@ -2,12 +2,12 @@
 mod tests {
     use bitcoin::consensus::deserialize;
     use libbitcoinkernel_sys::{
-        register_validation_interface, unregister_validation_interface, verify, Block,
-        BlockIndexInfo, BlockManagerOptions, BlockUndo, ChainParams, ChainType,
-        ChainstateLoadOptions, ChainstateManager, ChainstateManagerOptions, Context,
-        ContextBuilder, KernelError, KernelNotificationInterfaceCallbackHolder, Log, Logger,
-        ProcessBlockError, ScriptPubkey, Transaction, TxOut, Utxo,
-        ValidationInterfaceCallbackHolder, ValidationInterfaceWrapper, VERIFY_ALL_PRE_TAPROOT,
+        register_validation_interface, unregister_validation_interface, verify, Block, BlockHash,
+        BlockManagerOptions, BlockUndo, ChainParams, ChainType, ChainstateLoadOptions,
+        ChainstateManager, ChainstateManagerOptions, Context, ContextBuilder, KernelError,
+        KernelNotificationInterfaceCallbackHolder, Log, Logger, ProcessBlockError, ScriptPubkey,
+        Transaction, TxOut, Utxo, ValidationInterfaceCallbackHolder, ValidationInterfaceWrapper,
+        VERIFY_ALL_PRE_TAPROOT,
     };
     use std::fs::File;
     use std::io::{BufRead, BufReader};
@@ -212,11 +212,11 @@ mod tests {
             chainman.process_block(&block).unwrap();
         }
         let block_index_genesis = chainman.get_block_index_genesis();
-        let info = block_index_genesis.info();
-        assert_eq!(info.height, 0);
+        let height = block_index_genesis.height();
+        assert_eq!(height, 0);
         let block_index_1 = chainman.get_next_block_index(block_index_genesis).unwrap();
-        let info = block_index_1.info();
-        assert_eq!(info.height, 1);
+        let height = block_index_1.height();
+        assert_eq!(height, 1);
 
         let block_index_tip = chainman.get_block_index_tip();
         let raw_block_tip: Vec<u8> = chainman.read_block_data(&block_index_tip).unwrap().into();
@@ -411,9 +411,8 @@ mod tests {
         is_send::<BlockUndo>();
         is_sync::<ChainstateManager>();
         is_send::<ChainstateManager>();
-        is_sync::<BlockIndexInfo>();
-        is_send::<BlockIndexInfo>();
-
+        is_sync::<BlockHash>();
+        is_send::<BlockHash>();
         // is_sync::<Rc<u8>>(); // won't compile, kept as a failure case.
         // is_send::<Rc<u8>>(); // won't compile, kept as a failure case.
     }