Skip to content

Commit d8ffac2

Browse files
Squashed 'libbitcoinkernel-sys/bitcoin/' changes from e9f46bc02864..208700196015
REVERT: e9f46bc02864 test kernel_Block git-subtree-dir: libbitcoinkernel-sys/bitcoin git-subtree-split: 208700196015235c8a730c5fbb0f1313df4068e9
1 parent d42d9cc commit d8ffac2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/kernel/blockreader/blockreader.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ bool kernel_block_index_has_witness(const kernel_BlockIndex* block_index)
391391
return bi->nStatus & BLOCK_OPT_WITNESS;
392392
}
393393

394-
kernel_Block* kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index_)
394+
kernel_BlockPointer* kernel_blockreader_get_block_by_index(const kernel_blockreader_Reader* reader, const kernel_BlockIndex* block_index_)
395395
{
396396
auto br = cast_const_blockreader(reader);
397397
const CBlockIndex* block_index{cast_const_block_index(block_index_)};
@@ -402,7 +402,7 @@ kernel_Block* kernel_blockreader_get_block_by_index(const kernel_blockreader_Rea
402402
return nullptr;
403403
}
404404

405-
return reinterpret_cast<kernel_Block*>(block_opt.value());
405+
return reinterpret_cast<kernel_BlockPointer*>(block_opt.value());
406406
}
407407

408408
uint32_t kernel_block_pointer_get_transaction_count(const kernel_BlockPointer* block_pointer)

src/kernel/blockreader/blockreader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ BITCOINKERNEL_API bool BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_index_is_fa
103103

104104
BITCOINKERNEL_API bool BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_index_has_witness(const kernel_BlockIndex* block_index) BITCOINKERNEL_ARG_NONNULL(1);
105105

106-
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);
106+
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);
107107

108108
BITCOINKERNEL_API uint32_t BITCOINKERNEL_WARN_UNUSED_RESULT kernel_block_pointer_get_transaction_count(const kernel_BlockPointer* block_pointer) BITCOINKERNEL_ARG_NONNULL(1);
109109

0 commit comments

Comments
 (0)