Add BlockHashView and make BlockTreeEntry hash method return a view

Author: stringintech

kernel/block_hash.go

@@ -21,11 +21,38 @@ func (blockHashCFuncs) copy(ptr unsafe.Pointer) unsafe.Pointer {
 // BlockHash is a type-safe identifier for a block.
 type BlockHash struct {
 	*handle
+	blockHashApi
 }
 
 func newBlockHash(ptr *C.btck_BlockHash, fromOwned bool) *BlockHash {
 	h := newHandle(unsafe.Pointer(ptr), blockHashCFuncs{}, fromOwned)
-	return &BlockHash{handle: h}
+	return &BlockHash{handle: h, blockHashApi: blockHashApi{(*C.btck_BlockHash)(h.ptr)}}
+}
+
+// BlockHashView is a type-safe identifier for a block.
+type BlockHashView struct {
+	blockHashApi
+	ptr *C.btck_BlockHash
+}
+
+func newBlockHashView(ptr *C.btck_BlockHash) *BlockHashView {
+	return &BlockHashView{
+		blockHashApi: blockHashApi{ptr},
+		ptr:          ptr,
+	}
+}
+
+type blockHashApi struct {
+	ptr *C.btck_BlockHash
+}
+
+func (bh *blockHashApi) blockHashPtr() *C.btck_BlockHash {
+	return bh.ptr
+}
+
+// BlockHashLike is an interface for types that can provide a block hash pointer.
+type BlockHashLike interface {
+	blockHashPtr() *C.btck_BlockHash
 }
 
 // NewBlockHash creates a new BlockHash from a 32-byte hash value.
@@ -38,23 +65,23 @@ func NewBlockHash(hashBytes [32]byte) *BlockHash {
 }
 
 // Bytes returns the 32-byte representation of the block hash.
-func (bh *BlockHash) Bytes() [32]byte {
+func (bh *blockHashApi) Bytes() [32]byte {
 	var output [32]C.uchar
-	C.btck_block_hash_to_bytes((*C.btck_BlockHash)(bh.ptr), &output[0])
+	C.btck_block_hash_to_bytes(bh.ptr, &output[0])
 	return *(*[32]byte)(unsafe.Pointer(&output[0]))
 }
 
 // Copy creates a copy of the block hash.
-func (bh *BlockHash) Copy() *BlockHash {
-	return newBlockHash((*C.btck_BlockHash)(bh.ptr), false)
+func (bh *blockHashApi) Copy() *BlockHash {
+	return newBlockHash(bh.ptr, false)
 }
 
 // Equals checks if two block hashes are equal.
 //
 // Parameters:
-//   - other: Block hash to compare against
+//   - other: Block hash to compare against (can be *BlockHash or *BlockHashView)
 //
 // Returns true if the block hashes are equal.
-func (bh *BlockHash) Equals(other *BlockHash) bool {
-	return C.btck_block_hash_equals((*C.btck_BlockHash)(bh.ptr), (*C.btck_BlockHash)(other.ptr)) != 0
+func (bh *blockHashApi) Equals(other BlockHashLike) bool {
+	return C.btck_block_hash_equals(bh.ptr, other.blockHashPtr()) != 0
 }

kernel/block_tree_entry.go

@@ -23,9 +23,9 @@ func (bi *BlockTreeEntry) Height() int32 {
 }
 
 // Hash returns the block hash associated with this block tree entry.
-func (bi *BlockTreeEntry) Hash() *BlockHash {
+func (bi *BlockTreeEntry) Hash() *BlockHashView {
 	ptr := C.btck_block_tree_entry_get_block_hash(bi.ptr)
-	return newBlockHash(check(ptr), true)
+	return newBlockHashView(check(ptr))
 }
 
 // Previous returns the previous block tree entry in the chain.

kernel/chainstate_manager.go

@@ -113,8 +113,8 @@ func (cm *ChainstateManager) GetActiveChain() *Chain {
 // Returns nil if no block with this hash is found in the block index. The returned
 // BlockTreeEntry is a non-owned pointer valid for the lifetime of this chainstate
 // manager.
-func (cm *ChainstateManager) GetBlockTreeEntryByHash(blockHash *BlockHash) *BlockTreeEntry {
-	ptr := C.btck_chainstate_manager_get_block_tree_entry_by_hash((*C.btck_ChainstateManager)(cm.ptr), (*C.btck_BlockHash)(blockHash.ptr))
+func (cm *ChainstateManager) GetBlockTreeEntryByHash(blockHash BlockHashLike) *BlockTreeEntry {
+	ptr := C.btck_chainstate_manager_get_block_tree_entry_by_hash((*C.btck_ChainstateManager)(cm.ptr), blockHash.blockHashPtr())
 	if ptr == nil {
 		return nil
 	}

kernel/chainstate_manager_test.go

@@ -97,7 +97,6 @@ func (s *ChainstateManagerTestSuite) TestGetBlockTreeEntryByHash(t *testing.T) {
 	genesis := chain.GetGenesis()
 
 	genesisHash := genesis.Hash()
-	defer genesisHash.Destroy()
 
 	// Use GetBlockTreeEntryByHash to find genesis
 	foundGenesisIndex := s.Manager.GetBlockTreeEntryByHash(genesisHash)
@@ -116,7 +115,6 @@ func (s *ChainstateManagerTestSuite) TestGetBlockTreeEntryByHash(t *testing.T) {
 	tipIndex := chain.GetTip()
 
 	tipHash := tipIndex.Hash()
-	defer tipHash.Destroy()
 
 	foundTipIndex := s.Manager.GetBlockTreeEntryByHash(tipHash)
 	if foundTipIndex == nil {