Skip to content

Commit 178a3dd

Browse files
committed
Fix tx relay regression, adapt to block/tx const query returns.
1 parent 94badad commit 178a3dd

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

include/bitcoin/node/protocols/protocol_block_out.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ class BCN_API protocol_block_out
4949
size_t locator_limit();
5050

5151
void send_next_data(inventory_ptr inventory);
52-
void send_block(const code& ec, block_ptr message,
52+
void send_block(const code& ec, block_const_ptr message,
5353
uint64_t height, inventory_ptr inventory);
54-
void send_merkle_block(const code& ec, merkle_block_ptr message,
54+
void send_merkle_block(const code& ec, merkle_block_const_ptr message,
5555
uint64_t height, inventory_ptr inventory);
56-
void send_compact_block(const code& ec, compact_block_ptr message,
56+
void send_compact_block(const code& ec, compact_block_const_ptr message,
5757
uint64_t height, inventory_ptr inventory);
5858

5959
bool handle_receive_get_data(const code& ec,

include/bitcoin/node/protocols/protocol_transaction_out.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BCN_API protocol_transaction_out
4646

4747
private:
4848
void send_next_data(inventory_ptr inventory);
49-
void send_transaction(const code& ec, transaction_ptr transaction,
49+
void send_transaction(const code& ec, transaction_const_ptr transaction,
5050
size_t height, size_t position, inventory_ptr inventory);
5151

5252
bool handle_receive_get_data(const code& ec,

src/protocols/protocol_block_out.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void protocol_block_out::send_next_data(inventory_ptr inventory)
310310
}
311311
}
312312

313-
void protocol_block_out::send_block(const code& ec, block_ptr message,
313+
void protocol_block_out::send_block(const code& ec, block_const_ptr message,
314314
uint64_t, inventory_ptr inventory)
315315
{
316316
if (stopped(ec))
@@ -343,7 +343,7 @@ void protocol_block_out::send_block(const code& ec, block_ptr message,
343343

344344
// TODO: move merkle_block to derived class protocol_block_out_70001.
345345
void protocol_block_out::send_merkle_block(const code& ec,
346-
merkle_block_ptr message, uint64_t, inventory_ptr inventory)
346+
merkle_block_const_ptr message, uint64_t, inventory_ptr inventory)
347347
{
348348
if (stopped(ec))
349349
return;
@@ -375,7 +375,7 @@ void protocol_block_out::send_merkle_block(const code& ec,
375375

376376
// TODO: move merkle_block to derived class protocol_block_out_70014.
377377
void protocol_block_out::send_compact_block(const code& ec,
378-
compact_block_ptr message, uint64_t, inventory_ptr inventory)
378+
compact_block_const_ptr message, uint64_t, inventory_ptr inventory)
379379
{
380380
if (stopped(ec))
381381
return;

src/protocols/protocol_transaction_out.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ void protocol_transaction_out::send_next_data(inventory_ptr inventory)
176176

177177
// TODO: send block_transaction message as applicable.
178178
void protocol_transaction_out::send_transaction(const code& ec,
179-
transaction_ptr transaction, size_t, size_t position,
179+
transaction_const_ptr transaction, size_t position, size_t /*height*/,
180180
inventory_ptr inventory)
181181
{
182182
if (stopped(ec))

0 commit comments

Comments
 (0)