Adapt to C API size_t usages

Author: stringintech

kernel/block.go

@@ -81,7 +81,7 @@ func (b *Block) CountTransactions() (uint64, error) {
 func (b *Block) GetTransactionAt(index uint64) (*Transaction, error) {
 	checkReady(b)
 
-	ptr := C.btck_block_get_transaction_at(b.ptr, C.uint64_t(index))
+	ptr := C.btck_block_get_transaction_at(b.ptr, C.size_t(index))
 	if ptr == nil {
 		return nil, ErrKernelBlockGetTransaction
 	}

kernel/block_spent_outputs.go

@@ -15,16 +15,16 @@ type BlockSpentOutputs struct {
 	ptr *C.btck_BlockSpentOutputs
 }
 
-// Size returns the number of transaction spent outputs contained in block spent outputs
-func (bso *BlockSpentOutputs) Size() uint64 {
+// Count returns the number of transaction spent outputs contained in block spent outputs
+func (bso *BlockSpentOutputs) Count() uint64 {
 	checkReady(bso)
-	return uint64(C.btck_block_spent_outputs_size(bso.ptr))
+	return uint64(C.btck_block_spent_outputs_count(bso.ptr))
 }
 
 // GetTransactionSpentOutputsAt returns the transaction spent outputs at the specified index
 func (bso *BlockSpentOutputs) GetTransactionSpentOutputsAt(index uint64) (*TransactionSpentOutputs, error) {
 	checkReady(bso)
-	ptr := C.btck_block_spent_outputs_get_transaction_spent_outputs_at(bso.ptr, C.uint64_t(index))
+	ptr := C.btck_block_spent_outputs_get_transaction_spent_outputs_at(bso.ptr, C.size_t(index))
 	if ptr == nil {
 		return nil, ErrKernelBlockSpentOutputsGetTransactionSpentOutputsAt
 	}

kernel/block_tree_entry_test.go

@@ -17,10 +17,7 @@ func TestBlockTreeEntryGetPrevious(t *testing.T) {
 	defer chain.Destroy()
 
 	// Get block at height 1
-	entry, err := chain.GetByHeight(1)
-	if err != nil {
-		t.Fatalf("GetByHeight(1) error = %v", err)
-	}
+	entry := chain.GetByHeight(1)
 	defer entry.Destroy()
 
 	// Test getting previous block (should be genesis)

kernel/chain.go

@@ -41,17 +41,17 @@ func (c *Chain) GetGenesis() (*BlockTreeEntry, error) {
 	return entry, nil
 }
 
-// GetByHeight returns the block tree entry at the specified height or nil if no block at this height
-func (c *Chain) GetByHeight(height int) (*BlockTreeEntry, error) {
+// GetByHeight returns the block tree entry at the specified height
+func (c *Chain) GetByHeight(height int) *BlockTreeEntry {
 	checkReady(c)
 	ptr := C.btck_chain_get_by_height(c.ptr, C.int(height))
 	if ptr == nil {
-		return nil, nil
+		panic(ErrKernelChainGetByHeight)
 	}
 
 	entry := &BlockTreeEntry{ptr: ptr}
 	runtime.SetFinalizer(entry, (*BlockTreeEntry).destroy)
-	return entry, nil
+	return entry
 }
 
 // GetNextBlockTreeEntry returns the next block tree entry in the active chain, or nil if block tree entry is the chain tip or not in the chain

kernel/chain_test.go

@@ -69,10 +69,7 @@ func TestChain(t *testing.T) {
 	}
 
 	// Test GetByHeight
-	block1, err := chain.GetByHeight(1)
-	if err != nil {
-		t.Fatalf("GetByHeight(1) error = %v", err)
-	}
+	block1 := chain.GetByHeight(1)
 	defer block1.Destroy()
 
 	if block1.Height() != 1 {

kernel/chainstate_manager_test.go

@@ -28,10 +28,7 @@ func (s *ChainstateManagerTestSuite) TestBlockSpentOutputs(t *testing.T) {
 	}
 	defer chain.Destroy()
 
-	blockIndex, err := chain.GetByHeight(202)
-	if err != nil {
-		t.Fatalf("GetByHeight(202) error = %v", err)
-	}
+	blockIndex := chain.GetByHeight(202)
 	defer blockIndex.Destroy()
 
 	blockSpentOutputs, err := s.Manager.ReadBlockSpentOutputs(blockIndex)
@@ -41,7 +38,7 @@ func (s *ChainstateManagerTestSuite) TestBlockSpentOutputs(t *testing.T) {
 	defer blockSpentOutputs.Destroy()
 
 	// Test transaction spent outputs count
-	txCount := blockSpentOutputs.Size()
+	txCount := blockSpentOutputs.Count()
 	if txCount != 20 {
 		t.Errorf("Expected 20 transactions, got %d", txCount)
 	}
@@ -54,7 +51,7 @@ func (s *ChainstateManagerTestSuite) TestBlockSpentOutputs(t *testing.T) {
 		}
 		defer txSpentOutputs.Destroy()
 
-		spentOutputSize := txSpentOutputs.Size()
+		spentOutputSize := txSpentOutputs.Count()
 		if spentOutputSize != 1 {
 			t.Errorf("Expected transaction spent output size 1, got %d", spentOutputSize)
 		}

kernel/errors.go

@@ -65,6 +65,7 @@ var (
 
 	ErrChainParametersUninitialized = &UninitializedError{ObjectName: "chainParameters"}
 	ErrKernelChainParametersCreate  = &KernelError{Operation: "btck_chain_parameters_create"}
+	ErrKernelChainGetByHeight       = &KernelError{Operation: "btck_chain_get_by_height"}
 
 	ErrChainUninitialized = &UninitializedError{ObjectName: "chain"}
 

kernel/transaction.go

@@ -66,7 +66,7 @@ func (t *Transaction) CountOutputs() (uint64, error) {
 func (t *Transaction) GetOutputAt(index uint64) (*TransactionOutput, error) {
 	checkReady(t)
 
-	ptr := C.btck_transaction_get_output_at(t.ptr, C.uint64_t(index))
+	ptr := C.btck_transaction_get_output_at(t.ptr, C.size_t(index))
 	if ptr == nil {
 		return nil, ErrKernelTransactionGetOutput
 	}

kernel/transaction_spent_outputs.go

@@ -15,16 +15,16 @@ type TransactionSpentOutputs struct {
 	ptr *C.btck_TransactionSpentOutputs
 }
 
-// Size returns the number of spent transaction outputs for the transaction
-func (tso *TransactionSpentOutputs) Size() uint64 {
+// Count returns the number of spent transaction outputs for the transaction
+func (tso *TransactionSpentOutputs) Count() uint64 {
 	checkReady(tso)
-	return uint64(C.btck_transaction_spent_outputs_size(tso.ptr))
+	return uint64(C.btck_transaction_spent_outputs_count(tso.ptr))
 }
 
 // GetCoinAt returns a coin contained in the transaction spent outputs at the specified index
 func (tso *TransactionSpentOutputs) GetCoinAt(index uint64) (*Coin, error) {
 	checkReady(tso)
-	ptr := C.btck_transaction_spent_outputs_get_coin_at(tso.ptr, C.uint64_t(index))
+	ptr := C.btck_transaction_spent_outputs_get_coin_at(tso.ptr, C.size_t(index))
 	if ptr == nil {
 		return nil, ErrKernelTransactionSpentOutputsGetCoinAt
 	}