Skip to content

Commit fa0ed07

Browse files
author
MarcoFalke
committed
refactor: VectorWriter without nVersion
The field is unused, so remove it. This is also required for future commits.
1 parent 98b0acd commit fa0ed07

File tree

9 files changed

+33
-43
lines changed

9 files changed

+33
-43
lines changed

src/blockfilter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ GCSFilter::GCSFilter(const Params& params, const ElementSet& elements)
8181
}
8282
m_F = static_cast<uint64_t>(m_N) * static_cast<uint64_t>(m_params.m_M);
8383

84-
CVectorWriter stream(GCS_SER_VERSION, m_encoded, 0);
84+
VectorWriter stream{m_encoded, 0};
8585

8686
WriteCompactSize(stream, m_N);
8787

8888
if (elements.empty()) {
8989
return;
9090
}
9191

92-
BitStreamWriter<CVectorWriter> bitwriter(stream);
92+
BitStreamWriter bitwriter{stream};
9393

9494
uint64_t last_value = 0;
9595
for (uint64_t value : BuildHashedSet(elements)) {

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ bool V1Transport::SetMessageToSend(CSerializedNetMsg& msg) noexcept
818818

819819
// serialize header
820820
m_header_to_send.clear();
821-
CVectorWriter{INIT_PROTO_VERSION, m_header_to_send, 0, hdr};
821+
VectorWriter{m_header_to_send, 0, hdr};
822822

823823
// update state
824824
m_message_to_send = std::move(msg);

src/netmessagemaker.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
class CNetMsgMaker
1313
{
1414
public:
15-
explicit CNetMsgMaker(int nVersionIn) : nVersion(nVersionIn){}
15+
explicit CNetMsgMaker(int /*unused*/) {}
1616

1717
template <typename... Args>
18-
CSerializedNetMsg Make(int nFlags, std::string msg_type, Args&&... args) const
18+
CSerializedNetMsg Make(int /*unused*/, std::string msg_type, Args&&... args) const
1919
{
2020
CSerializedNetMsg msg;
2121
msg.m_type = std::move(msg_type);
22-
CVectorWriter{nFlags | nVersion, msg.data, 0, std::forward<Args>(args)...};
22+
VectorWriter{msg.data, 0, std::forward<Args>(args)...};
2323
return msg;
2424
}
2525

@@ -28,9 +28,6 @@ class CNetMsgMaker
2828
{
2929
return Make(0, std::move(msg_type), std::forward<Args>(args)...);
3030
}
31-
32-
private:
33-
const int nVersion;
3431
};
3532

3633
#endif // BITCOIN_NETMESSAGEMAKER_H

src/psbt.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ struct PSBTInput
316316
const auto& [leaf_hashes, origin] = leaf_origin;
317317
SerializeToVector(s, PSBT_IN_TAP_BIP32_DERIVATION, xonly);
318318
std::vector<unsigned char> value;
319-
CVectorWriter s_value{s.GetVersion(), value, 0};
319+
VectorWriter s_value{value, 0};
320320
s_value << leaf_hashes;
321321
SerializeKeyOrigin(s_value, origin);
322322
s << value;
@@ -757,7 +757,7 @@ struct PSBTOutput
757757
if (!m_tap_tree.empty()) {
758758
SerializeToVector(s, PSBT_OUT_TAP_TREE);
759759
std::vector<unsigned char> value;
760-
CVectorWriter s_value{s.GetVersion(), value, 0};
760+
VectorWriter s_value{value, 0};
761761
for (const auto& [depth, leaf_ver, script] : m_tap_tree) {
762762
s_value << depth;
763763
s_value << leaf_ver;
@@ -771,7 +771,7 @@ struct PSBTOutput
771771
const auto& [leaf_hashes, origin] = leaf;
772772
SerializeToVector(s, PSBT_OUT_TAP_BIP32_DERIVATION, xonly);
773773
std::vector<unsigned char> value;
774-
CVectorWriter s_value{s.GetVersion(), value, 0};
774+
VectorWriter s_value{value, 0};
775775
s_value << leaf_hashes;
776776
SerializeKeyOrigin(s_value, origin);
777777
s << value;

src/signet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ std::optional<SignetTxs> SignetTxs::Create(const CBlock& block, const CScript& c
110110
uint256 signet_merkle = ComputeModifiedMerkleRoot(modified_cb, block);
111111

112112
std::vector<uint8_t> block_data;
113-
CVectorWriter writer{INIT_PROTO_VERSION, block_data, 0};
113+
VectorWriter writer{block_data, 0};
114114
writer << block.nVersion;
115115
writer << block.hashPrevBlock;
116116
writer << signet_merkle;

src/streams.h

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,15 @@ inline void Xor(Span<std::byte> write, Span<const std::byte> key, size_t key_off
4949
*
5050
* The referenced vector will grow as necessary
5151
*/
52-
class CVectorWriter
52+
class VectorWriter
5353
{
54-
public:
55-
54+
public:
5655
/*
57-
* @param[in] nVersionIn Serialization Version (including any flags)
5856
* @param[in] vchDataIn Referenced byte vector to overwrite/append
5957
* @param[in] nPosIn Starting position. Vector index where writes should start. The vector will initially
6058
* grow as necessary to max(nPosIn, vec.size()). So to append, use vec.size().
6159
*/
62-
CVectorWriter(int nVersionIn, std::vector<unsigned char>& vchDataIn, size_t nPosIn) : nVersion{nVersionIn}, vchData{vchDataIn}, nPos{nPosIn}
60+
VectorWriter(std::vector<unsigned char>& vchDataIn, size_t nPosIn) : vchData{vchDataIn}, nPos{nPosIn}
6361
{
6462
if(nPos > vchData.size())
6563
vchData.resize(nPos);
@@ -69,7 +67,7 @@ class CVectorWriter
6967
* @param[in] args A list of items to serialize starting at nPosIn.
7068
*/
7169
template <typename... Args>
72-
CVectorWriter(int nVersionIn, std::vector<unsigned char>& vchDataIn, size_t nPosIn, Args&&... args) : CVectorWriter{nVersionIn, vchDataIn, nPosIn}
70+
VectorWriter(std::vector<unsigned char>& vchDataIn, size_t nPosIn, Args&&... args) : VectorWriter{vchDataIn, nPosIn}
7371
{
7472
::SerializeMany(*this, std::forward<Args>(args)...);
7573
}
@@ -85,19 +83,14 @@ class CVectorWriter
8583
}
8684
nPos += src.size();
8785
}
88-
template<typename T>
89-
CVectorWriter& operator<<(const T& obj)
86+
template <typename T>
87+
VectorWriter& operator<<(const T& obj)
9088
{
9189
::Serialize(*this, obj);
9290
return (*this);
9391
}
94-
int GetVersion() const
95-
{
96-
return nVersion;
97-
}
9892

9993
private:
100-
const int nVersion;
10194
std::vector<unsigned char>& vchData;
10295
size_t nPos;
10396
};

src/test/fuzz/golomb_rice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ FUZZ_TARGET(golomb_rice)
5151
for (int i = 0; i < n; ++i) {
5252
elements.insert(ConsumeRandomLengthByteVector(fuzzed_data_provider, 16));
5353
}
54-
CVectorWriter stream{0, golomb_rice_data, 0};
54+
VectorWriter stream{golomb_rice_data, 0};
5555
WriteCompactSize(stream, static_cast<uint32_t>(elements.size()));
56-
BitStreamWriter<CVectorWriter> bitwriter(stream);
56+
BitStreamWriter bitwriter{stream};
5757
if (!elements.empty()) {
5858
uint64_t last_value = 0;
5959
for (const uint64_t value : BuildHashedSet(elements, static_cast<uint64_t>(elements.size()) * static_cast<uint64_t>(BASIC_FILTER_M))) {

src/test/streams_tests.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,49 +74,49 @@ BOOST_AUTO_TEST_CASE(streams_vector_writer)
7474
// point should yield the same results, even if the first test grew the
7575
// vector.
7676

77-
CVectorWriter{INIT_PROTO_VERSION, vch, 0, a, b};
77+
VectorWriter{vch, 0, a, b};
7878
BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
79-
CVectorWriter{INIT_PROTO_VERSION, vch, 0, a, b};
79+
VectorWriter{vch, 0, a, b};
8080
BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
8181
vch.clear();
8282

83-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
83+
VectorWriter{vch, 2, a, b};
8484
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
85-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
85+
VectorWriter{vch, 2, a, b};
8686
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
8787
vch.clear();
8888

8989
vch.resize(5, 0);
90-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
90+
VectorWriter{vch, 2, a, b};
9191
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
92-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
92+
VectorWriter{vch, 2, a, b};
9393
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
9494
vch.clear();
9595

9696
vch.resize(4, 0);
97-
CVectorWriter{INIT_PROTO_VERSION, vch, 3, a, b};
97+
VectorWriter{vch, 3, a, b};
9898
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
99-
CVectorWriter{INIT_PROTO_VERSION, vch, 3, a, b};
99+
VectorWriter{vch, 3, a, b};
100100
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
101101
vch.clear();
102102

103103
vch.resize(4, 0);
104-
CVectorWriter{INIT_PROTO_VERSION, vch, 4, a, b};
104+
VectorWriter{vch, 4, a, b};
105105
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
106-
CVectorWriter{INIT_PROTO_VERSION, vch, 4, a, b};
106+
VectorWriter{vch, 4, a, b};
107107
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
108108
vch.clear();
109109

110-
CVectorWriter{INIT_PROTO_VERSION, vch, 0, bytes};
110+
VectorWriter{vch, 0, bytes};
111111
BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
112-
CVectorWriter{INIT_PROTO_VERSION, vch, 0, bytes};
112+
VectorWriter{vch, 0, bytes};
113113
BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
114114
vch.clear();
115115

116116
vch.resize(4, 8);
117-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, bytes, b};
117+
VectorWriter{vch, 2, a, bytes, b};
118118
BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
119-
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, bytes, b};
119+
VectorWriter{vch, 2, a, bytes, b};
120120
BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
121121
vch.clear();
122122
}

src/wallet/test/wallet_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ bool malformed_descriptor(std::ios_base::failure e)
752752
BOOST_FIXTURE_TEST_CASE(wallet_descriptor_test, BasicTestingSetup)
753753
{
754754
std::vector<unsigned char> malformed_record;
755-
CVectorWriter vw{0, malformed_record, 0};
755+
VectorWriter vw{malformed_record, 0};
756756
vw << std::string("notadescriptor");
757757
vw << uint64_t{0};
758758
vw << int32_t{0};

0 commit comments

Comments
 (0)