Adapt to C API and remove BlockPointer

Author: stringintech

kernel/context_options.go

@@ -14,7 +14,7 @@ extern void go_notify_warning_set_bridge(void* user_data, btck_Warning warning,
 extern void go_notify_warning_unset_bridge(void* user_data, btck_Warning warning);
 extern void go_notify_flush_error_bridge(void* user_data, const char* message, size_t message_len);
 extern void go_notify_fatal_error_bridge(void* user_data, const char* message, size_t message_len);
-extern void go_validation_interface_block_checked_bridge(void* user_data, const btck_BlockPointer* block, const btck_BlockValidationState* state);
+extern void go_validation_interface_block_checked_bridge(void* user_data, btck_Block* block, const btck_BlockValidationState* state);
 */
 import "C"
 import (

kernel/validation_interface_callbacks.go

@@ -11,49 +11,17 @@ import (
 
 // ValidationInterfaceCallbacks contains all the Go callback function types for validation interface.
 type ValidationInterfaceCallbacks struct {
-	OnBlockChecked func(block *BlockPointer, state *BlockValidationState)
+	OnBlockChecked func(block *Block, state *BlockValidationState)
 }
 
 //export go_validation_interface_block_checked_bridge
-func go_validation_interface_block_checked_bridge(user_data unsafe.Pointer, block *C.btck_BlockPointer, state *C.btck_BlockValidationState) {
+func go_validation_interface_block_checked_bridge(user_data unsafe.Pointer, block *C.btck_Block, state *C.btck_BlockValidationState) {
 	// Convert void* back to Handle - user_data contains Handle ID
 	handle := cgo.Handle(user_data)
 	// Retrieve original Go callback struct
 	callbacks := handle.Value().(*ValidationInterfaceCallbacks)
 
 	if callbacks.OnBlockChecked != nil {
-		goBlock := &BlockPointer{ptr: (*C.btck_BlockPointer)(unsafe.Pointer(block))}
-		goState := &BlockValidationState{ptr: (*C.btck_BlockValidationState)(unsafe.Pointer(state))}
-		callbacks.OnBlockChecked(goBlock, goState)
+		callbacks.OnBlockChecked(newBlockFromPtr(block), &BlockValidationState{ptr: state})
 	}
 }
-
-// BlockPointer wraps the C kernel_BlockPointer for validation interface callbacks
-type BlockPointer struct {
-	ptr *C.btck_BlockPointer
-}
-
-// GetHash returns the block hash
-func (bp *BlockPointer) GetHash() (*BlockHash, error) {
-	if bp.ptr == nil {
-		return nil, ErrBlockUninitialized
-	}
-
-	hashPtr := C.btck_block_pointer_get_hash(bp.ptr)
-	if hashPtr == nil {
-		return nil, ErrKernelBlockGetHash
-	}
-
-	return &BlockHash{ptr: hashPtr}, nil
-}
-
-// Bytes returns the serialized block
-func (bp *BlockPointer) Bytes() ([]byte, error) {
-	if bp.ptr == nil {
-		return nil, ErrBlockUninitialized
-	}
-
-	return writeToBytes(func(writer C.btck_WriteBytes, user_data unsafe.Pointer) C.int {
-		return C.btck_block_pointer_to_bytes(bp.ptr, writer, user_data)
-	})
-}

kernel/validation_interface_callbacks_test.go

@@ -11,7 +11,7 @@ func TestValidationInterfaceCallbacks(t *testing.T) {
 	var lastBlockData []byte
 
 	callbacks := &ValidationInterfaceCallbacks{
-		OnBlockChecked: func(block *BlockPointer, state *BlockValidationState) {
+		OnBlockChecked: func(block *Block, state *BlockValidationState) {
 			blockCheckedCalled = true
 			lastValidationMode = state.ValidationMode()
 			var err error