From faf9082a5f689e2e51a474bf654e4e9b6ca29685 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Wed, 14 May 2025 10:00:40 +0200 Subject: [PATCH] test: Fix whitespace in prevector_tests.cpp Bitcoin Core uses 4 spaces indent, but the test was in some lines using 5 or more. Just clang-format the whole file. --- src/test/prevector_tests.cpp | 92 ++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 0588bf9b4a8..4b63e76fa9c 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015-2022 The Bitcoin Core developers +// Copyright (c) 2015-present The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -15,8 +15,9 @@ BOOST_FIXTURE_TEST_SUITE(prevector_tests, TestingSetup) -template -class prevector_tester { +template +class prevector_tester +{ typedef std::vector realtype; realtype real_vector; realtype real_vector_alt; @@ -31,36 +32,37 @@ class prevector_tester { template - void local_check_equal(A a, B b) - { - local_check(a == b); - } + void local_check_equal(A a, B b) + { + local_check(a == b); + } void local_check(bool b) { passed &= b; } - void test() { + void test() + { const pretype& const_pre_vector = pre_vector; local_check_equal(real_vector.size(), pre_vector.size()); local_check_equal(real_vector.empty(), pre_vector.empty()); for (Size s = 0; s < real_vector.size(); s++) { - local_check(real_vector[s] == pre_vector[s]); - local_check(&(pre_vector[s]) == &(pre_vector.begin()[s])); - local_check(&(pre_vector[s]) == &*(pre_vector.begin() + s)); - local_check(&(pre_vector[s]) == &*((pre_vector.end() + s) - real_vector.size())); + local_check(real_vector[s] == pre_vector[s]); + local_check(&(pre_vector[s]) == &(pre_vector.begin()[s])); + local_check(&(pre_vector[s]) == &*(pre_vector.begin() + s)); + local_check(&(pre_vector[s]) == &*((pre_vector.end() + s) - real_vector.size())); } // local_check(realtype(pre_vector) == real_vector); local_check(pretype(real_vector.begin(), real_vector.end()) == pre_vector); local_check(pretype(pre_vector.begin(), pre_vector.end()) == pre_vector); size_t pos = 0; for (const T& v : pre_vector) { - local_check(v == real_vector[pos++]); + local_check(v == real_vector[pos++]); } for (const T& v : pre_vector | std::views::reverse) { local_check(v == real_vector[--pos]); } for (const T& v : const_pre_vector) { - local_check(v == real_vector[pos++]); + local_check(v == real_vector[pos++]); } for (const T& v : const_pre_vector | std::views::reverse) { local_check(v == real_vector[--pos]); @@ -76,7 +78,8 @@ class prevector_tester { } public: - void resize(Size s) { + void resize(Size s) + { real_vector.resize(s); local_check_equal(real_vector.size(), s); pre_vector.resize(s); @@ -84,7 +87,8 @@ public: test(); } - void reserve(Size s) { + void reserve(Size s) + { real_vector.reserve(s); local_check(real_vector.capacity() >= s); pre_vector.reserve(s); @@ -92,74 +96,87 @@ public: test(); } - void insert(Size position, const T& value) { + void insert(Size position, const T& value) + { real_vector.insert(real_vector.begin() + position, value); pre_vector.insert(pre_vector.begin() + position, value); test(); } - void insert(Size position, Size count, const T& value) { + void insert(Size position, Size count, const T& value) + { real_vector.insert(real_vector.begin() + position, count, value); pre_vector.insert(pre_vector.begin() + position, count, value); test(); } - template - void insert_range(Size position, I first, I last) { + template + void insert_range(Size position, I first, I last) + { real_vector.insert(real_vector.begin() + position, first, last); pre_vector.insert(pre_vector.begin() + position, first, last); test(); } - void erase(Size position) { + void erase(Size position) + { real_vector.erase(real_vector.begin() + position); pre_vector.erase(pre_vector.begin() + position); test(); } - void erase(Size first, Size last) { + void erase(Size first, Size last) + { real_vector.erase(real_vector.begin() + first, real_vector.begin() + last); pre_vector.erase(pre_vector.begin() + first, pre_vector.begin() + last); test(); } - void update(Size pos, const T& value) { + void update(Size pos, const T& value) + { real_vector[pos] = value; pre_vector[pos] = value; test(); } - void push_back(const T& value) { + void push_back(const T& value) + { real_vector.push_back(value); pre_vector.push_back(value); test(); } - void pop_back() { + void pop_back() + { real_vector.pop_back(); pre_vector.pop_back(); test(); } - void clear() { + void clear() + { real_vector.clear(); pre_vector.clear(); } - void assign(Size n, const T& value) { + void assign(Size n, const T& value) + { real_vector.assign(n, value); pre_vector.assign(n, value); } - Size size() const { + Size size() const + { return real_vector.size(); } - Size capacity() const { + Size capacity() const + { return pre_vector.capacity(); } - void shrink_to_fit() { + void shrink_to_fit() + { pre_vector.shrink_to_fit(); test(); } @@ -171,19 +188,22 @@ public: test(); } - void move() { + void move() + { real_vector = std::move(real_vector_alt); real_vector_alt.clear(); pre_vector = std::move(pre_vector_alt); pre_vector_alt.clear(); } - void copy() { + void copy() + { real_vector = real_vector_alt; pre_vector = pre_vector_alt; } - void resize_uninitialized(realtype values) { + void resize_uninitialized(realtype values) + { size_t r = values.size(); size_t s = real_vector.size() / 2; if (real_vector.capacity() < s + r) { @@ -203,11 +223,13 @@ public: test(); } - ~prevector_tester() { + ~prevector_tester() + { BOOST_CHECK_MESSAGE(passed, "insecure_rand: " + rand_seed.ToString()); } - prevector_tester(FastRandomContext& rng) { + prevector_tester(FastRandomContext& rng) + { rand_seed = rng.rand256(); rng.Reseed(rand_seed); }