Merge commit 'fd80393ab2cfbc7e1efb2fb65a0cfecae3ca3da8'

Author: sedited

libbitcoinkernel-sys/bitcoin/src/kernel/bitcoinkernel.cpp

@@ -383,12 +383,6 @@ std::shared_ptr<KernelValidationInterface>* cast_validation_interface(kernel_Val
     return reinterpret_cast<std::shared_ptr<KernelValidationInterface>*>(interface);
 }
 
-std::function<void()>* cast_validation_event(kernel_ValidationEvent* event)
-{
-    assert(event);
-    return reinterpret_cast<std::function<void()>*>(event);
-}
-
 const BlockValidationState* cast_block_validation_state(const kernel_BlockValidationState* block_validation_state)
 {
     assert(block_validation_state);
@@ -664,6 +658,7 @@ void kernel_context_options_set_notifications(kernel_ContextOptions* options_, c
 {
     auto options{cast_context_options(options_)};
     auto notifications{reinterpret_cast<const KernelNotifications*>(notifications_)};
+    // Copy the notifications, so the caller can free it again
     options->m_notifications = std::make_unique<const KernelNotifications>(*notifications);
 }
 
@@ -738,18 +733,6 @@ void kernel_validation_interface_destroy(kernel_ValidationInterface* validation_
     }
 }
 
-void kernel_execute_event_and_destroy(kernel_ValidationEvent* event)
-{
-    std::function<void()>* func = cast_validation_event(event);
-    try {
-        (*func)();
-        delete func;
-    } catch (const std::exception& e) {
-        LogError("Failed to execute event: %s\n", std::string{e.what()});
-        if (func) delete func;
-    }
-}
-
 kernel_ValidationMode kernel_get_validation_mode_from_block_validation_state(const kernel_BlockValidationState* block_validation_state_)
 {
     auto& block_validation_state = *cast_block_validation_state(block_validation_state_);

libbitcoinkernel-sys/bitcoin/src/kernel/bitcoinkernel.h

@@ -212,12 +212,6 @@ typedef struct kernel_Block kernel_Block;
  */
 typedef struct kernel_BlockPointer kernel_BlockPointer;
 
-/**
- * Opaque data structure for holding a validation event. The event can only be
- * processed by calling kernel_execute_event_and_destroy(..).
- */
-typedef struct kernel_ValidationEvent kernel_ValidationEvent;
-
 /**
  * Opaque data structure for holding the state of a block during validation.
  *
@@ -643,8 +637,8 @@ void kernel_notifications_destroy(const kernel_Notifications* notifications);
 kernel_ContextOptions* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_context_options_create();
 
 /**
- * @brief Sets a single, specific field in the options. The option type has to
- * match the option value.
+ * @brief Sets the chain params for the context options. The context created
+ * with the options will be configured for these chain parameters.
  *
  * @param[in] context_options  Non-null, previously created with kernel_context_options_create.
  * @param[in] chain_parameters Is set to the context options.
@@ -655,7 +649,8 @@ void kernel_context_options_set_chainparams(
 ) BITCOINKERNEL_ARG_NONNULL(1) BITCOINKERNEL_ARG_NONNULL(2);
 
 /**
- * @brief Set the kernel notifications for context option.
+ * @brief Set the kernel notifications for the context options. The context
+ * created with the options will be configured with these notifications.
  *
  * @param[in] context_options Non-null, previously created with kernel_context_options_create.
  * @param[in] notifications   Is set to the context options.