highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-27 17:49:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#29071: refactor: Remove Span operator==, Use std::ranges::equal

Browse Source 
fad0cf6f26 refactor: Use std::ranges::equal in GetNetworkForMagic (MarcoFalke)
fadf0a7e15 refactor: Remove Span operator==, Use std::ranges::equal (MarcoFalke)

Pull request description:

  `std::span` removed the comparison operators, so it makes sense to remove them for the `Span` "backport" as well. Using `std::ranges::equal` also has the benefit that some `Span` temporary constructions can now be dropped.

  This is required to move from `Span` toward `std::span`.

ACKs for top commit:
  hodlinator:
    Untested Code Review re-ACK fad0cf6
  stickies-v:
    ACK fad0cf6f26
  TheCharlatan:
    ACK fad0cf6f26

Tree-SHA512: 5b9d1826ceac2aabae2295bc89893dd23ac3a1cc0d41988331cdbdc21be531aa91795d5273819f349f79648c6c4f30ed31af6e7a3816153e92080061b92ffe00
This commit is contained in:
merge-script
2024-08-28 10:34:47 +01:00
parent 128ade02e4 fad0cf6f26
commit 80f00cafde
21 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/chainparams.cpp
View File

@@ -694,15 +694,15 @@ std::optional<ChainType> GetNetworkForMagic(const MessageStartChars& message)
const auto regtest_msg = CChainParams::RegTest({})->MessageStart();
const auto signet_msg = CChainParams::SigNet({})->MessageStart();
if (std::equal(message.begin(), message.end(), mainnet_msg.data())) {
if (std::ranges::equal(message, mainnet_msg)) {
return ChainType::MAIN;
} else if (std::equal(message.begin(), message.end(), testnet_msg.data())) {
} else if (std::ranges::equal(message, testnet_msg)) {
return ChainType::TESTNET;
} else if (std::equal(message.begin(), message.end(), testnet4_msg.data())) {
} else if (std::ranges::equal(message, testnet4_msg)) {
return ChainType::TESTNET4;
} else if (std::equal(message.begin(), message.end(), regtest_msg.data())) {
} else if (std::ranges::equal(message, regtest_msg)) {
return ChainType::REGTEST;
} else if (std::equal(message.begin(), message.end(), signet_msg.data())) {
} else if (std::ranges::equal(message, signet_msg)) {
return ChainType::SIGNET;
}
return std::nullopt;