Skip to content

Commit eb0e4cd

Browse files
committed
Fix incorrect rebase conflict resolution.
1 parent b07a45e commit eb0e4cd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/interface/blockchain.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void blockchain::history_fetched(const code& ec,
7777
serial.write_error_code(ec);
7878

7979
// TODO: add serialization to history_compact.
80-
for (const auto& row : history)
80+
for (const auto& row: history)
8181
{
8282
BITCOIN_ASSERT(row.height <= max_uint32);
8383
serial.write_byte(static_cast<uint8_t>(row.kind));
@@ -120,7 +120,7 @@ void blockchain::transaction_fetched(const code& ec, transaction_ptr tx,
120120

121121
auto result = build_chunk(
122122
{
123-
message::to_bytes(ec),
123+
message::to_bytes(error::success),
124124
tx->to_data(canonical)
125125
});
126126

@@ -215,7 +215,7 @@ void blockchain::block_header_fetched(const code& ec, header_const_ptr header,
215215
auto result = build_chunk(
216216
{
217217
message::to_bytes(error::success),
218-
header->to_data(canonical_version)
218+
header->to_data(canonical)
219219
});
220220

221221
handler(message(request, std::move(result)));

0 commit comments

Comments
 (0)