Skip to content

Commit fb6a2ab

Browse files
ajtownsajtowns
committed
scripted-diff: use SER_PARAMS_OPFUNC
-BEGIN VERIFY SCRIPT- sed -i 's/WithParams(\(CAddress::V[12]_[A-Z]*\) *, */\1(/g' $(git grep -l 'WithParams' src/) sed -i 's/WithParams(\(CNetAddr::V[12]\) *, */\1(/g' $(git grep -l 'WithParams' src/) sed -i 's@\(CNetAddr::V1.CService{}.*\) //@\1 //@' src/test/util/net.cpp -END VERIFY SCRIPT-
1 parent 5e5c8f8 commit fb6a2ab

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎src/addrdb.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,14 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
216216
void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors)
217217
{
218218
LOG_TIME_SECONDS(strprintf("Flush %d outbound block-relay-only peer addresses to anchors.dat", anchors.size()));
219-
SerializeFileDB("anchors", anchors_db_path, WithParams(CAddress::V2_DISK, anchors));
219+
SerializeFileDB("anchors", anchors_db_path, CAddress::V2_DISK(anchors));
220220
}
221221

222222
std::vector<CAddress> ReadAnchors(const fs::path& anchors_db_path)
223223
{
224224
std::vector<CAddress> anchors;
225225
try {
226-
DeserializeFileDB(anchors_db_path, WithParams(CAddress::V2_DISK, anchors));
226+
DeserializeFileDB(anchors_db_path, CAddress::V2_DISK(anchors));
227227
LogPrintf("Loaded %i addresses from %s\n", anchors.size(), fs::quoted(fs::PathToString(anchors_db_path.filename())));
228228
} catch (const std::exception&) {
229229
anchors.clear();

‎src/net_processing.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,8 +1415,8 @@ void PeerManagerImpl::PushNodeVersion(CNode& pnode, const Peer& peer)
14151415

14161416
const bool tx_relay{!RejectIncomingTxs(pnode)};
14171417
m_connman.PushMessage(&pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, my_services, nTime,
1418-
your_services, WithParams(CNetAddr::V1, addr_you), // Together the pre-version-31402 serialization of CAddress "addrYou" (without nTime)
1419-
my_services, WithParams(CNetAddr::V1, CService{}), // Together the pre-version-31402 serialization of CAddress "addrMe" (without nTime)
1418+
your_services, CNetAddr::V1(addr_you), // Together the pre-version-31402 serialization of CAddress "addrYou" (without nTime)
1419+
my_services, CNetAddr::V1(CService{}), // Together the pre-version-31402 serialization of CAddress "addrMe" (without nTime)
14201420
nonce, strSubVersion, nNodeStartingHeight, tx_relay));
14211421

14221422
if (fLogIPs) {
@@ -3293,7 +3293,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
32933293
nTime = 0;
32943294
}
32953295
vRecv.ignore(8); // Ignore the addrMe service bits sent by the peer
3296-
vRecv >> WithParams(CNetAddr::V1, addrMe);
3296+
vRecv >> CNetAddr::V1(addrMe);
32973297
if (!pfrom.IsInboundConn())
32983298
{
32993299
m_addrman.SetServices(pfrom.addr, nServices);

‎src/test/addrman_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ static auto MakeCorruptPeersDat()
10191019
std::optional<CNetAddr> resolved{LookupHost("252.2.2.2", false)};
10201020
BOOST_REQUIRE(resolved.has_value());
10211021
AddrInfo info = AddrInfo(addr, resolved.value());
1022-
s << WithParams(CAddress::V1_DISK, info);
1022+
s << CAddress::V1_DISK(info);
10231023

10241024
return s;
10251025
}

‎src/test/fuzz/addrman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ CNetAddr RandAddr(FuzzedDataProvider& fuzzed_data_provider, FastRandomContext& f
8383
s << net;
8484
s << fast_random_context.randbytes(net_len_map.at(net));
8585

86-
s >> WithParams(CAddress::V2_NETWORK, addr);
86+
s >> CAddress::V2_NETWORK(addr);
8787
}
8888

8989
// Return a dummy IPv4 5.5.5.5 if we generated an invalid address.

‎src/test/net_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ BOOST_AUTO_TEST_CASE(initial_advertise_from_version_message)
850850
std::chrono::microseconds time_received_dummy{0};
851851

852852
const auto msg_version =
853-
msg_maker.Make(NetMsgType::VERSION, PROTOCOL_VERSION, services, time, services, WithParams(CAddress::V1_NETWORK, peer_us));
853+
msg_maker.Make(NetMsgType::VERSION, PROTOCOL_VERSION, services, time, services, CAddress::V1_NETWORK(peer_us));
854854
CDataStream msg_version_stream{msg_version.data, SER_NETWORK, PROTOCOL_VERSION};
855855

856856
m_node.peerman->ProcessMessage(
@@ -876,7 +876,7 @@ BOOST_AUTO_TEST_CASE(initial_advertise_from_version_message)
876876
DataStream s{data};
877877
std::vector<CAddress> addresses;
878878

879-
s >> WithParams(CAddress::V1_NETWORK, addresses);
879+
s >> CAddress::V1_NETWORK(addresses);
880880

881881
for (const auto& addr : addresses) {
882882
if (addr == expected) {

‎src/test/netbase_tests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ BOOST_AUTO_TEST_CASE(caddress_serialize_v1)
561561
{
562562
DataStream s{};
563563

564-
s << WithParams(CAddress::V1_NETWORK, fixture_addresses);
564+
s << CAddress::V1_NETWORK(fixture_addresses);
565565
BOOST_CHECK_EQUAL(HexStr(s), stream_addrv1_hex);
566566
}
567567

@@ -570,15 +570,15 @@ BOOST_AUTO_TEST_CASE(caddress_unserialize_v1)
570570
DataStream s{ParseHex(stream_addrv1_hex)};
571571
std::vector<CAddress> addresses_unserialized;
572572

573-
s >> WithParams(CAddress::V1_NETWORK, addresses_unserialized);
573+
s >> CAddress::V1_NETWORK(addresses_unserialized);
574574
BOOST_CHECK(fixture_addresses == addresses_unserialized);
575575
}
576576

577577
BOOST_AUTO_TEST_CASE(caddress_serialize_v2)
578578
{
579579
DataStream s{};
580580

581-
s << WithParams(CAddress::V2_NETWORK, fixture_addresses);
581+
s << CAddress::V2_NETWORK(fixture_addresses);
582582
BOOST_CHECK_EQUAL(HexStr(s), stream_addrv2_hex);
583583
}
584584

@@ -587,7 +587,7 @@ BOOST_AUTO_TEST_CASE(caddress_unserialize_v2)
587587
DataStream s{ParseHex(stream_addrv2_hex)};
588588
std::vector<CAddress> addresses_unserialized;
589589

590-
s >> WithParams(CAddress::V2_NETWORK, addresses_unserialized);
590+
s >> CAddress::V2_NETWORK(addresses_unserialized);
591591
BOOST_CHECK(fixture_addresses == addresses_unserialized);
592592
}
593593

‎src/test/util/net.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ void ConnmanTestMsg::Handshake(CNode& node,
3333
Using<CustomUintFormatter<8>>(remote_services), //
3434
int64_t{}, // dummy time
3535
int64_t{}, // ignored service bits
36-
WithParams(CNetAddr::V1, CService{}), // dummy
36+
CNetAddr::V1(CService{}), // dummy
3737
int64_t{}, // ignored service bits
38-
WithParams(CNetAddr::V1, CService{}), // ignored
38+
CNetAddr::V1(CService{}), // ignored
3939
uint64_t{1}, // dummy nonce
4040
std::string{}, // dummy subver
4141
int32_t{}, // dummy starting_height

0 commit comments

Comments
 (0)