mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-05 13:17:49 +02:00
Merge bitcoin/bitcoin#28892: refactor: P2P transport without serialize version and type
fa79a881cerefactor: P2P transport without serialize version and type (MarcoFalke)fa9b5f4fe3refactor: NetMsg::Make() without nVersion (MarcoFalke)66669da4a5Remove unused Make() overload in netmessagemaker.h (MarcoFalke)fa0ed07941refactor: VectorWriter without nVersion (MarcoFalke) Pull request description: Now that the serialize framework ignores the serialize version and serialize type, everything related to it can be removed from the code. This is the first step, removing dead code from the P2P stack. A different pull will remove it from the wallet and other parts. ACKs for top commit: ajtowns: reACKfa79a881ceTree-SHA512: 785b413580d980f51f0d4f70ea5e0a99ce14cd12cb065393de2f5254891be94a14f4266110c8b87bd2dbc37467676655bce13bdb295ab139749fcd8b61bd5110
This commit is contained in:
@@ -74,49 +74,49 @@ BOOST_AUTO_TEST_CASE(streams_vector_writer)
|
||||
// point should yield the same results, even if the first test grew the
|
||||
// vector.
|
||||
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 0, a, b};
|
||||
VectorWriter{vch, 0, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 0, a, b};
|
||||
VectorWriter{vch, 0, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{1, 2}}));
|
||||
vch.clear();
|
||||
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
|
||||
VectorWriter{vch, 2, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
|
||||
VectorWriter{vch, 2, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2}}));
|
||||
vch.clear();
|
||||
|
||||
vch.resize(5, 0);
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
|
||||
VectorWriter{vch, 2, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, b};
|
||||
VectorWriter{vch, 2, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 1, 2, 0}}));
|
||||
vch.clear();
|
||||
|
||||
vch.resize(4, 0);
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 3, a, b};
|
||||
VectorWriter{vch, 3, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 3, a, b};
|
||||
VectorWriter{vch, 3, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 1, 2}}));
|
||||
vch.clear();
|
||||
|
||||
vch.resize(4, 0);
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 4, a, b};
|
||||
VectorWriter{vch, 4, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 4, a, b};
|
||||
VectorWriter{vch, 4, a, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{0, 0, 0, 0, 1, 2}}));
|
||||
vch.clear();
|
||||
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 0, bytes};
|
||||
VectorWriter{vch, 0, bytes};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 0, bytes};
|
||||
VectorWriter{vch, 0, bytes};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{3, 4, 5, 6}}));
|
||||
vch.clear();
|
||||
|
||||
vch.resize(4, 8);
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, bytes, b};
|
||||
VectorWriter{vch, 2, a, bytes, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
|
||||
CVectorWriter{INIT_PROTO_VERSION, vch, 2, a, bytes, b};
|
||||
VectorWriter{vch, 2, a, bytes, b};
|
||||
BOOST_CHECK((vch == std::vector<unsigned char>{{8, 8, 1, 3, 4, 5, 6, 2}}));
|
||||
vch.clear();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user