Skip to content
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

Out parameters first. #1440

Merged
merged 1 commit into from
Apr 28, 2024
Merged

Out parameters first. #1440

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
4 changes: 2 additions & 2 deletions include/bitcoin/system/wallet/neutrino_filter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ struct BC_API block_filter
data_chunk filter;
};

bool BC_API compute_filter(const chain::block& block,
data_chunk& out_filter) NOEXCEPT;
bool BC_API compute_filter(data_chunk& out,
const chain::block& block) NOEXCEPT;

hash_digest BC_API compute_filter_header(const hash_digest& previous_block,
const data_chunk& filter) NOEXCEPT;
Expand Down
4 changes: 2 additions & 2 deletions src/wallet/neutrino_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ constexpr uint64_t golomb_target_false_positive_rate = 784931;

constexpr auto rate = golomb_target_false_positive_rate;

bool compute_filter(const chain::block& block, data_chunk& out_filter) NOEXCEPT
bool compute_filter(data_chunk& out, const chain::block& block) NOEXCEPT
{
const auto hash = block.hash();
const auto key = to_siphash_key(slice<zero, to_half(hash_size)>(hash));
Expand Down Expand Up @@ -75,7 +75,7 @@ bool compute_filter(const chain::block& block, data_chunk& out_filter) NOEXCEPT
distinct(scripts);

BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
stream::out::data stream(out_filter);
stream::out::data stream(out);
BC_POP_WARNING()

write::bytes::ostream writer(stream);
Expand Down
28 changes: 14 additions & 14 deletions test/wallet/neutrino_filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE(compute__first_11_blocks__success)
{
const chain::block block(data, true);
data_chunk filter;
BOOST_REQUIRE(neutrino::compute_filter(block, filter));
BOOST_REQUIRE(neutrino::compute_filter(filter, block));
const auto header = neutrino::compute_filter_header(previous_filter_header, filter);
////std::cout << "header: " << encode_base16(header) << std::endl;
////std::cout << "filter: " << encode_base16(filter) << std::endl;
Expand Down Expand Up @@ -1425,7 +1425,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_54503__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));

const auto expected_filter = base16_chunk("06294070f18c8b0ff84b92738259ca89b4");
BOOST_REQUIRE_EQUAL(result, expected_filter);
Expand Down Expand Up @@ -2847,7 +2847,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_54499__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));

const auto expected_filter = base16_chunk("1c275e3182d7d12a3bde9c34441fddffd314e1600dc25e30bfdcecdc40a35594e1561678bd8cac799f9fd001c2f8dfd2d4c909755e5a6bdc7731c39e00b8f73326e1508039cff3bc39d000");
BOOST_REQUIRE_EQUAL(result, expected_filter);
Expand Down Expand Up @@ -2879,7 +2879,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_0__success)
////BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand All @@ -2905,7 +2905,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_2__success)
////BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand All @@ -2931,7 +2931,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_3__success)
////BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand All @@ -2957,7 +2957,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_15007__success)
////BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}
BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_49291_wothout_prevouts__false)
Expand Down Expand Up @@ -3015,7 +3015,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_49291_wothout_prevouts__fal
BOOST_REQUIRE(validated_block.is_valid());

data_chunk result;
BOOST_REQUIRE(!neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(!neutrino::compute_filter(result, validated_block));
}

BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_49291__success)
Expand Down Expand Up @@ -3148,7 +3148,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_49291__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand Down Expand Up @@ -3274,7 +3274,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_180480__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand Down Expand Up @@ -3419,7 +3419,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_926485__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand All @@ -3444,7 +3444,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_987876__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand Down Expand Up @@ -3490,7 +3490,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_1263442__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand All @@ -3514,7 +3514,7 @@ BOOST_AUTO_TEST_CASE(neutrino__compute_filter__block_1414221__success)
BOOST_REQUIRE(add_metadata(metadata, validated_block));

data_chunk result;
BOOST_REQUIRE(neutrino::compute_filter(validated_block, result));
BOOST_REQUIRE(neutrino::compute_filter(result, validated_block));
BOOST_REQUIRE_EQUAL(result, expected_filter);
}

Expand Down
Loading