ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-04 20:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Use .contains() method where available (#2277)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-07-01 18:28:12 +01:00
committed by GitHub
parent 8abc9c6645
commit 5cdd8a642f
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/CliArgs.cpp
View File

@@ -60,17 +60,17 @@ CliArgs::parse(int argc, char const* argv[])
po::store(po::command_line_parser(argc, argv).options(description).positional(positional).run(), parsed); po::store(po::command_line_parser(argc, argv).options(description).positional(positional).run(), parsed);
po::notify(parsed); po::notify(parsed);
if (parsed.count("help") != 0u) { if (parsed.contains("help")) {
std::cout << "Clio server " << util::build::getClioFullVersionString() << "\n\n" << description; std::cout << "Clio server " << util::build::getClioFullVersionString() << "\n\n" << description;
return Action{Action::Exit{EXIT_SUCCESS}}; return Action{Action::Exit{EXIT_SUCCESS}};
} }
if (parsed.count("version") != 0u) { if (parsed.contains("version")) {
std::cout << util::build::getClioFullVersionString() << '\n'; std::cout << util::build::getClioFullVersionString() << '\n';
return Action{Action::Exit{EXIT_SUCCESS}}; return Action{Action::Exit{EXIT_SUCCESS}};
} }
if (parsed.count("config-description") != 0u) { if (parsed.contains("config-description")) {
std::filesystem::path const filePath = parsed["config-description"].as<std::string>(); std::filesystem::path const filePath = parsed["config-description"].as<std::string>();
auto const res = util::config::ClioConfigDescription::generateConfigDescriptionToFile(filePath); auto const res = util::config::ClioConfigDescription::generateConfigDescriptionToFile(filePath);
@@ -83,18 +83,17 @@ CliArgs::parse(int argc, char const* argv[])
auto configPath = parsed["conf"].as<std::string>(); auto configPath = parsed["conf"].as<std::string>();
if (parsed.count("migrate") != 0u) { if (parsed.contains("migrate")) {
auto const opt = parsed["migrate"].as<std::string>(); auto const opt = parsed["migrate"].as<std::string>();
if (opt == "status") if (opt == "status")
return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::status()}}; return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::status()}};
return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::migration(opt)}}; return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::migration(opt)}};
} }
if (parsed.count("verify") != 0u) if (parsed.contains("verify"))
return Action{Action::VerifyConfig{.configPath = std::move(configPath)}}; return Action{Action::VerifyConfig{.configPath = std::move(configPath)}};
return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.count("ng-web-server") != 0} return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.contains("ng-web-server")}};
};
} }
} // namespace app } // namespace app

2
src/feed/impl/TransactionFeed.cpp
View File

@@ -280,7 +280,7 @@ TransactionFeed::pub(
data->getFieldAmount(ripple::sfTakerPays).issue(), data->getFieldAmount(ripple::sfTakerPays).issue(),
(*data)[~ripple::sfDomainID] (*data)[~ripple::sfDomainID]
}; };
if (affectedBooks.find(book) == affectedBooks.end()) { if (!affectedBooks.contains(book)) {
affectedBooks.insert(book); affectedBooks.insert(book);
} }
} }

1
src/rpc/handlers/TransactionEntry.cpp
View File

@@ -31,7 +31,6 @@
#include <xrpl/basics/base_uint.h> #include <xrpl/basics/base_uint.h>
#include <xrpl/basics/chrono.h> #include <xrpl/basics/chrono.h>
#include <xrpl/basics/strHex.h> #include <xrpl/basics/strHex.h>
#include <xrpl/protocol/LedgerHeader.h>
#include <xrpl/protocol/jss.h> #include <xrpl/protocol/jss.h>
#include <string> #include <string>

2
src/util/LedgerUtils.cpp
View File

@@ -36,7 +36,7 @@ LedgerTypes::getLedgerEntryTypeFromStr(std::string const& entryName)
return map; return map;
}(); }();
if (kTYPE_MAP.find(entryName) == kTYPE_MAP.end()) if (!kTYPE_MAP.contains(entryName))
return ripple::ltANY; return ripple::ltANY;
return kTYPE_MAP.at(entryName); return kTYPE_MAP.at(entryName);