Skip to content

Commit d613458

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#22169: p2p, rpc, fuzz: various tiny follow-ups
c274574 p2p, rpc, fuzz: various tiny follow-ups (Jon Atack) Pull request description: - p2p: pass `Span` by value per bitcoin#22143 (comment) as a follow-up to 8be56f0 - rpc: remove duplicate `CAddress` constructor per bitcoin#22043 (comment) - fuzz: rename 3 fuzz targets changed in eba9a94 back to their original names per bitcoin-core/qa-assets#63 (comment) ACKs for top commit: MarcoFalke: cr ACK c274574 practicalswift: cr ACK c274574: patch looks correct jarolrod: ACK c274574 Tree-SHA512: 3672b210d30b3a91f3a6455005e4d3cb1f89621820c417c645d24b06e53459440122a1f75758e0e04c3d04eff9d6f88ef62865216aa3e42301c6df783f7c0b4a
1 parent 72d51a7 commit d613458

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/netaddress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static std::string IPv6ToString(Span<const uint8_t> a)
558558
// clang-format on
559559
}
560560

561-
static std::string OnionToString(const Span<const uint8_t>& addr)
561+
static std::string OnionToString(Span<const uint8_t> addr)
562562
{
563563
uint8_t checksum[torv3::CHECKSUM_LEN];
564564
torv3::Checksum(addr, checksum);

src/test/fuzz/deserialize.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ FUZZ_TARGET_DESERIALIZE(coins_deserialize, {
212212
Coin coin;
213213
DeserializeFromFuzzingInput(buffer, coin);
214214
})
215-
FUZZ_TARGET_DESERIALIZE(net_address_deserialize, {
215+
FUZZ_TARGET_DESERIALIZE(netaddr_deserialize, {
216216
CNetAddr na;
217217
DeserializeFromFuzzingInput(buffer, na);
218218
if (na.IsAddrV1Compatible()) {
219219
AssertEqualAfterSerializeDeserialize(na);
220220
}
221221
AssertEqualAfterSerializeDeserialize(na, INIT_PROTO_VERSION | ADDRV2_FORMAT);
222222
})
223-
FUZZ_TARGET_DESERIALIZE(net_service_deserialize, {
223+
FUZZ_TARGET_DESERIALIZE(service_deserialize, {
224224
CService s;
225225
DeserializeFromFuzzingInput(buffer, s);
226226
if (s.IsAddrV1Compatible()) {

0 commit comments

Comments
 (0)