Squashed 'libbitcoinkernel-sys/bitcoin/' changes from ca3508d37517..e9f46bc02864

e9f46bc02864 test kernel_Block
208700196015 Change kernel install directory temporarily
553a7131af46 Add BlockReader functionality to kernel library
REVERT: ca3508d37517 Change kernel install directory temporarily
REVERT: 4cd28090065b Add BlockReader functionality to kernel library

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: e9f46bc028648502718b17edcfe10ae4cf482dc1

Author: alexanderwiederin

src/kernel/blockreader/blockreader.cpp

@@ -391,7 +391,7 @@ bool kernel_block_index_has_witness(const kernel_BlockIndex* block_index)
     return bi->nStatus & BLOCK_OPT_WITNESS;
 }
 
-kernel_BlockPointer* kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index_)
+kernel_Block* kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index_)
 {
     auto br = cast_const_blockreader(reader);
     const CBlockIndex* block_index{cast_const_block_index(block_index_)};
@@ -402,7 +402,7 @@ kernel_BlockPointer* kernel_blockreader_get_block_by_index(const kernel_blockrea
         return nullptr;
     }
 
-    return reinterpret_cast<kernel_BlockPointer*>(block_opt.value());
+    return reinterpret_cast<kernel_Block*>(block_opt.value());
 }
 
 uint32_t kernel_block_pointer_get_transaction_count(const kernel_BlockPointer* block_pointer)
@@ -420,13 +420,13 @@ const kernel_Transaction* kernel_block_pointer_get_transaction(const kernel_Bloc
     return reinterpret_cast<const kernel_Transaction*>(block->vtx[index].get());
 }
 
-uint32_t kernel_transaction_get_transaction_input_count(const kernel_Transaction* _transaction)
+uint32_t kernel_transaction_get_input_count(const kernel_Transaction* _transaction)
 {
     const auto* transaction = cast_const_transaction(_transaction);
     return transaction->vin.size();
 }
 
-const kernel_TransactionInput* kernel_transaction_get_transaction_input(const kernel_Transaction* _transaction, size_t index)
+const kernel_TransactionInput* kernel_transaction_get_input(const kernel_Transaction* _transaction, size_t index)
 {
     const auto* transaction = cast_const_transaction(_transaction);
     if (index >= transaction->vin.size()) {

src/kernel/blockreader/blockreader.h

@@ -103,15 +103,15 @@ BITCOINKERNEL_API bool BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_index_is_fa
 
 BITCOINKERNEL_API bool BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_index_has_witness(const kernel_BlockIndex* block_index) BITCOINKERNEL_ARG_NONNULL(1);
 
-BITCOINKERNEL_API kernel_BlockPointer* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index) BITCOINKERNEL_ARG_NONNULL(1);
+BITCOINKERNEL_API kernel_Block* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index) BITCOINKERNEL_ARG_NONNULL(1);
 
 BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_pointer_get_transaction_count(const kernel_BlockPointer* block_pointer) BITCOINKERNEL_ARG_NONNULL(1);
 
 BITCOINKERNEL_API const kernel_Transaction* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_pointer_get_transaction(const kernel_BlockPointer* block_pointer, size_t index) BITCOINKERNEL_ARG_NONNULL(1);
 
-BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT kernel_transaction_get_transaction_input_count(const kernel_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
+BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT kernel_transaction_get_input_count(const kernel_Transaction* transaction) BITCOINKERNEL_ARG_NONNULL(1);
 
-BITCOINKERNEL_API const kernel_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_transaction_get_transaction_input(const kernel_Transaction*, size_t index) BITCOINKERNEL_ARG_NONNULL(1);
+BITCOINKERNEL_API const kernel_TransactionInput* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_transaction_get_input(const kernel_Transaction*, size_t index) BITCOINKERNEL_ARG_NONNULL(1);
 
 BITCOINKERNEL_API const kernel_TransactionOutPoint* BITCOINKERNEL_WARN_UNUSED_RESULT kernel_transaction_input_get_out_point(const kernel_TransactionInput* input) BITCOINKERNEL_ARG_NONNULL(1);