expand/CCash
1
0
Fork 0
mirror of https://github.com/Expand-sys/CCash synced 2026-03-22 20:47:10 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

turned some conditionals into turnary for code cleanliness

Browse source
This commit is contained in:
EntireTwix 2021-06-14 18:49:17 -07:00
parent 79f388af72
commit dedc62f0f7
1 changed files with 24 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/bank.cpp
View file

@ -8,15 +8,10 @@ int_fast8_t Bank::AddUser(const std::string &name, const std::string &init_pass)
} }
{ {
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{size_l};
if (users.try_emplace_l( return (users.try_emplace_l(
name, [](User &) {}, init_pass)) name, [](User &) {}, init_pass))
{ ? true
return true; : ErrorResponse::UserAlreadyExists;
}
else
{
return ErrorResponse::UserAlreadyExists;
}
} }
} }
int_fast8_t Bank::AdminAddUser(const std::string &attempt, std::string &&name, uint32_t init_bal, std::string &&init_pass) int_fast8_t Bank::AdminAddUser(const std::string &attempt, std::string &&name, uint32_t init_bal, std::string &&init_pass)
@ -31,56 +26,37 @@ int_fast8_t Bank::AdminAddUser(const std::string &attempt, std::string &&name, u
} }
{ {
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{size_l};
if (users.try_emplace_l( return (users.try_emplace_l(
name, [](User &) {}, init_bal, std::move(init_pass))) name, [](User &) {}, init_bal, std::move(init_pass)))
{ ? true
return true; : ErrorResponse::UserAlreadyExists;
}
else
{
return ErrorResponse::UserAlreadyExists;
}
} }
} }
int_fast8_t Bank::DelUser(const std::string &name, const std::string &attempt) int_fast8_t Bank::DelUser(const std::string &name, const std::string &attempt)
{ {
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{size_l};
bool state = false; bool state = false;
if (!users.erase_if(name, [&state, &attempt](User &u) { return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password); })) if (users.erase_if(name, [&state, &attempt](User &u) { return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password); }))
{
return (state) ? true : ErrorResponse::WrongPassword;
}
else
{ {
return ErrorResponse::UserNotFound; return ErrorResponse::UserNotFound;
} }
else
{
if (state)
{
return true;
}
else
{
return ErrorResponse::WrongPassword;
}
}
} }
int_fast8_t Bank::AdminDelUser(const std::string &name, const std::string &attempt) int_fast8_t Bank::AdminDelUser(const std::string &name, const std::string &attempt)
{ {
std::shared_lock<std::shared_mutex> lock{size_l}; std::shared_lock<std::shared_mutex> lock{size_l};
bool state = false; bool state = false;
if (!users.erase_if(name, [this, &state, &attempt](const User &) { return state = (admin_pass == attempt); })) if (users.erase_if(name, [this, &state, &attempt](const User &) { return state = (admin_pass == attempt); }))
{
return (state) ? true : ErrorResponse::WrongPassword;
}
else
{ {
return ErrorResponse::UserNotFound; return ErrorResponse::UserNotFound;
} }
else
{
if (state)
{
return true;
}
else
{
return ErrorResponse::WrongPassword;
}
}
} }
int_fast8_t Bank::SendFunds(const std::string &a_name, const std::string &b_name, uint32_t amount, const std::string &attempt) int_fast8_t Bank::SendFunds(const std::string &a_name, const std::string &b_name, uint32_t amount, const std::string &attempt)
@ -162,25 +138,11 @@ int_fast8_t Bank::SendFunds(const std::string &a_name, const std::string &b_name
int_fast8_t Bank::Contains(const std::string &name) const int_fast8_t Bank::Contains(const std::string &name) const
{ {
if (users.contains(name)) return (users.contains(name)) ? true : ErrorResponse::UserNotFound;
{
return true;
}
else
{
return ErrorResponse::UserNotFound;
}
} }
int_fast8_t Bank::AdminVerifyPass(const std::string &attempt) int_fast8_t Bank::AdminVerifyPass(const std::string &attempt)
{ {
if (admin_pass == attempt) return (admin_pass == attempt) ? true : ErrorResponse::WrongPassword;
{
return true;
}
else
{
return ErrorResponse::WrongPassword;
}
} }
int_fast8_t Bank::SetBal(const std::string &name, const std::string &attempt, uint32_t amount) int_fast8_t Bank::SetBal(const std::string &name, const std::string &attempt, uint32_t amount)
@ -189,16 +151,12 @@ int_fast8_t Bank::SetBal(const std::string &name, const std::string &attempt, ui
{ {
return ErrorResponse::WrongPassword; return ErrorResponse::WrongPassword;
} }
if (users.modify_if(name, [amount](User &u) {
return (users.modify_if(name, [amount](User &u) {
u.balance = amount; u.balance = amount;
})) }))
{ ? true
return true; : ErrorResponse::UserNotFound;
}
else
{
return ErrorResponse::UserNotFound;
}
} }
int_fast64_t Bank::GetBal(const std::string &name) const int_fast64_t Bank::GetBal(const std::string &name) const
{ {
@ -213,14 +171,7 @@ int_fast8_t Bank::VerifyPassword(const std::string &name, const std::string &att
{ {
int_fast8_t res = ErrorResponse::UserNotFound; int_fast8_t res = ErrorResponse::UserNotFound;
users.if_contains(name, [&res, &attempt](const User &u) { users.if_contains(name, [&res, &attempt](const User &u) {
if (u.password == XXH3_64bits(attempt.data(), attempt.size())) res = (u.password == XXH3_64bits(attempt.data(), attempt.size())) ? true : ErrorResponse::WrongPassword;
{
res = true;
}
else
{
res = ErrorResponse::WrongPassword;
}
}); });
return res; return res;
} }
@ -234,6 +185,7 @@ int_fast8_t Bank::ChangePassword(const std::string &name, const std::string &att
} }
else else
{ {
res = true;
u.password = XXH3_64bits(new_pass.data(), new_pass.size()); u.password = XXH3_64bits(new_pass.data(), new_pass.size());
} }
}); });