Update to newest API

Author: sedited

fuzz/fuzz_targets/fuzz_target_chainman.rs

@@ -15,7 +15,6 @@ use libbitcoinkernel_sys::{
 fn create_context(chain_type: ChainType) -> Context {
     ContextBuilder::new()
         .chain_type(chain_type)
-        .unwrap()
         .kn_callbacks(Box::new(KernelNotificationInterfaceCallbackHolder {
             kn_block_tip: Box::new(|_state, _block_index| {}),
             kn_header_tip: Box::new(|_state, _height, _timestamp, _presync| {}),
@@ -25,7 +24,6 @@ fn create_context(chain_type: ChainType) -> Context {
             kn_flush_error: Box::new(|_message| {}),
             kn_fatal_error: Box::new(|_message| {}),
         }))
-        .unwrap()
         .build()
         .unwrap()
 }
@@ -89,15 +87,13 @@ fuzz_target!(|data: ChainstateManagerInput| {
     match chainman.load_chainstate(
         ChainstateLoadOptions::new()
             .set_reindex(data.wipe_block_index)
-            .unwrap()
             .set_wipe_chainstate_db(data.wipe_chainstate_index)
-            .unwrap()
             .set_block_tree_db_in_memory(data.block_tree_db_in_memory)
-            .unwrap()
-            .set_chainstate_db_in_memory(data.chainstate_db_in_memory)
-            .unwrap(),
+            .set_chainstate_db_in_memory(data.chainstate_db_in_memory),
     ) {
-        Err(libbitcoinkernel_sys::KernelError::Internal(_)) => {}
+        Err(libbitcoinkernel_sys::KernelError::Internal(_)) => {
+            return;
+        }
         Err(err) => {
             let _ = std::fs::remove_dir_all(data_dir);
             panic!("this should never happen: {}", err);

fuzz/fuzz_targets/fuzz_target_verify.rs

@@ -3,7 +3,7 @@
 use arbitrary::Arbitrary;
 use libfuzzer_sys::fuzz_target;
 
-use libbitcoinkernel_sys::{verify, Utxo};
+use libbitcoinkernel_sys::{verify, ScriptPubkey, Transaction, TxOut};
 
 #[derive(Debug, Arbitrary)]
 pub struct UtxoWrapper {
@@ -23,19 +23,26 @@ pub struct VerifyInput {
 
 fuzz_target!(|data: VerifyInput| {
     // Call the verify function with the fuzzed inputs
-    let spent_outputs: Vec<Utxo> = data
+    let spent_outputs: Vec<TxOut> = data
         .spent_outputs
         .iter()
-        .map(|utxo| Utxo {
-            value: utxo.value,
-            script_pubkey: &utxo.script_pubkey,
+        .map(|utxo| {
+            let script_pubkey = ScriptPubkey::try_from(utxo.script_pubkey.as_slice()).unwrap();
+            TxOut::new(&script_pubkey, utxo.value)
         })
         .collect();
 
+    let script_pubkey = ScriptPubkey::try_from(data.script_pubkey.as_slice()).unwrap();
+    let transaction = if let Ok(res) = Transaction::try_from(data.tx_to.as_slice()) {
+        res
+    } else {
+        return;
+    };
+
     let _ = verify(
-        &data.script_pubkey,
+        &script_pubkey,
         data.amount,
-        &data.tx_to,
+        &transaction,
         data.input_index,
         data.flags,
         &spent_outputs,