Skip to content

Commit 6f7cb49

Browse files
committed
Adapt OnPoWValidBlock validation interface callback to new signature
1 parent cc65dc4 commit 6f7cb49

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

kernel/context_options.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (opts *ContextOptions) SetValidationInterface(callbacks *ValidationInterfac
9595
user_data: unsafe.Pointer(cgo.NewHandle(callbacks)),
9696
user_data_destroy: C.btck_DestroyCallback(C.go_delete_handle),
9797
block_checked: C.btck_ValidationInterfaceBlockChecked(C.go_validation_interface_block_checked_bridge),
98-
pow_valid_block: C.btck_ValidationInterfacePowValidBlock(C.go_validation_interface_pow_valid_block_bridge),
98+
pow_valid_block: C.btck_ValidationInterfacePoWValidBlock(C.go_validation_interface_pow_valid_block_bridge),
9999
block_connected: C.btck_ValidationInterfaceBlockConnected(C.go_validation_interface_block_connected_bridge),
100100
block_disconnected: C.btck_ValidationInterfaceBlockDisconnected(C.go_validation_interface_block_disconnected_bridge),
101101
}

kernel/validation_interface_callbacks.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// Note that these callbacks block any further validation execution when they are called.
1515
type ValidationInterfaceCallbacks struct {
1616
OnBlockChecked func(block *Block, state *BlockValidationState) // Called when a new block has been fully validated. Contains the result of its validation.
17-
OnPowValidBlock func(entry *BlockTreeEntry, block *Block) // Called when a new block extends the header chain and has a valid transaction and segwit merkle root.
17+
OnPoWValidBlock func(block *Block, entry *BlockTreeEntry) // Called when a new block extends the header chain and has a valid transaction and segwit merkle root.
1818
OnBlockConnected func(block *Block, entry *BlockTreeEntry) // Called when a block is valid and has now been connected to the best chain.
1919
OnBlockDisconnected func(block *Block, entry *BlockTreeEntry) // Called during a re-org when a block has been removed from the best chain.
2020
}
@@ -29,11 +29,11 @@ func go_validation_interface_block_checked_bridge(user_data unsafe.Pointer, bloc
2929
}
3030

3131
//export go_validation_interface_pow_valid_block_bridge
32-
func go_validation_interface_pow_valid_block_bridge(user_data unsafe.Pointer, entry *C.btck_BlockTreeEntry, block *C.btck_Block) {
32+
func go_validation_interface_pow_valid_block_bridge(user_data unsafe.Pointer, block *C.btck_Block, entry *C.btck_BlockTreeEntry) {
3333
handle := cgo.Handle(user_data)
3434
callbacks := handle.Value().(*ValidationInterfaceCallbacks)
35-
if callbacks.OnPowValidBlock != nil {
36-
callbacks.OnPowValidBlock(&BlockTreeEntry{ptr: entry}, newBlock(block, true))
35+
if callbacks.OnPoWValidBlock != nil {
36+
callbacks.OnPoWValidBlock(newBlock(block, true), &BlockTreeEntry{ptr: entry})
3737
}
3838
}
3939

0 commit comments

Comments
 (0)