Skip to content

Adapt to bc serializer changes. #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2016
Merged

Adapt to bc serializer changes. #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/interface/blockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void blockchain::fetch_block_header_by_hash(server_node& node,
const auto& data = request.data();
BITCOIN_ASSERT(data.size() == hash_size);

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const auto block_hash = deserial.read_hash();

node.chain().fetch_block_header(block_hash,
Expand All @@ -143,7 +143,7 @@ void blockchain::fetch_block_header_by_height(server_node& node,
const auto& data = request.data();
BITCOIN_ASSERT(data.size() == sizeof(uint32_t));

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const uint64_t height = deserial.read_4_bytes_little_endian();

node.chain().fetch_block_header(height,
Expand Down Expand Up @@ -184,7 +184,7 @@ void blockchain::fetch_block_transaction_hashes_by_hash(server_node& node,
const auto& data = request.data();
BITCOIN_ASSERT(data.size() == hash_size);

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const auto block_hash = deserial.read_hash();
node.chain().fetch_merkle_block(block_hash,
std::bind(&blockchain::merkle_block_fetched,
Expand All @@ -197,7 +197,7 @@ void blockchain::fetch_block_transaction_hashes_by_height(server_node& node,
const auto& data = request.data();
BITCOIN_ASSERT(data.size() == sizeof(uint32_t));

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const size_t block_height = deserial.read_4_bytes_little_endian();
node.chain().fetch_merkle_block(block_height,
std::bind(&blockchain::merkle_block_fetched,
Expand All @@ -210,7 +210,7 @@ void blockchain::merkle_block_fetched(const code& ec, merkle_block_ptr block,
// [ code:4 ]
// [[ hash:32 ]...]
data_chunk result(code_size + hash_size * block->hashes().size());
auto serial = make_serializer(result.begin());
auto serial = make_unsafe_serializer(result.begin());
serial.write_error_code(ec);

for (const auto& tx_hash: block->hashes())
Expand All @@ -230,7 +230,7 @@ void blockchain::fetch_transaction_position(server_node& node,
return;
}

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const auto tx_hash = deserial.read_hash();

node.chain().fetch_transaction_position(tx_hash,
Expand Down Expand Up @@ -310,7 +310,7 @@ void blockchain::fetch_block_height(server_node& node,
return;
}

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const auto block_hash = deserial.read_hash();
node.chain().fetch_block_height(block_hash,
std::bind(&blockchain::block_height_fetched,
Expand Down Expand Up @@ -345,7 +345,7 @@ void blockchain::fetch_stealth(server_node& node, const message& request,
return;
}

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());

// number_bits
const auto bit_size = deserial.read_byte();
Expand All @@ -358,7 +358,7 @@ void blockchain::fetch_stealth(server_node& node, const message& request,
}

// actual bitfield data
const auto blocks = deserial.read_data(binary::blocks_size(bit_size));
const auto blocks = deserial.read_bytes(binary::blocks_size(bit_size));
const binary prefix(bit_size, blocks);

// from_height
Expand All @@ -378,7 +378,7 @@ void blockchain::stealth_fetched(const code& ec,
// [ code:4 ]
// [[ ephemeral_key_hash:32 ][ address_hash:20 ][ tx_hash:32 ]...]
data_chunk result(code_size + row_size * stealth_results.size());
auto serial = make_serializer(result.begin());
auto serial = make_unsafe_serializer(result.begin());
serial.write_error_code(ec);

for (const auto& row: stealth_results)
Expand All @@ -402,7 +402,7 @@ void blockchain::fetch_stealth2(server_node& node, const message& request,
return;
}

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());

// number_bits
const auto bit_size = deserial.read_byte();
Expand All @@ -415,7 +415,7 @@ void blockchain::fetch_stealth2(server_node& node, const message& request,
}

// actual bitfield data
const auto blocks = deserial.read_data(binary::blocks_size(bit_size));
const auto blocks = deserial.read_bytes(binary::blocks_size(bit_size));
const binary prefix(bit_size, blocks);

// from_height
Expand All @@ -433,7 +433,7 @@ void blockchain::stealth_fetched2(const code& ec,
// [ code:4 ]
// [[ tx_hash:32 ]...]
data_chunk result(code_size + hash_size * stealth_results.size());
auto serial = make_serializer(result.begin());
auto serial = make_unsafe_serializer(result.begin());
serial.write_error_code(ec);

for (const auto& row: stealth_results)
Expand Down
2 changes: 1 addition & 1 deletion src/interface/transaction_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void transaction_pool::handle_validated(const code& ec,
// [ code:4 ]
// [[ unconfirmed_index:4 ]...]
data_chunk result(code_size + unconfirmed.size() * index_size);
auto serial = make_serializer(result.begin());
auto serial = make_unsafe_serializer(result.begin());
serial.write_error_code(ec);

for (const auto unconfirmed_index: unconfirmed)
Expand Down
8 changes: 4 additions & 4 deletions src/utility/fetch_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ bool unwrap_fetch_history_args(payment_address& address,
}

// TODO: add serialization to history_compact.
auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
const auto version_byte = deserial.read_byte();
const auto hash = deserial.read_short_hash();
from_height = static_cast<size_t>(deserial.read_4_bytes_little_endian());
Expand All @@ -69,7 +69,7 @@ void send_history_result(const code& ec, const history_compact::list& history,
sizeof(uint32_t) + sizeof(uint64_t);

data_chunk result(code_size + row_size * history.size());
auto serial = make_serializer(result.begin());
auto serial = make_unsafe_serializer(result.begin());
serial.write_error_code(ec);
////BITCOIN_ASSERT(serial.iterator() == result.begin() + code_size);

Expand All @@ -78,7 +78,7 @@ void send_history_result(const code& ec, const history_compact::list& history,
{
BITCOIN_ASSERT(row.height <= max_uint32);
serial.write_byte(static_cast<uint8_t>(row.kind));
serial.write_data(row.point.to_data());
serial.write_bytes(row.point.to_data());
serial.write_4_bytes_little_endian(row.height);
serial.write_8_bytes_little_endian(row.value);
}
Expand All @@ -103,7 +103,7 @@ bool unwrap_fetch_transaction_args(hash_digest& hash,
return false;
}

auto deserial = make_deserializer(data.begin(), data.end());
auto deserial = make_safe_deserializer(data.begin(), data.end());
hash = deserial.read_hash();
return true;
}
Expand Down