expand/CCash
1
0
Fork 0
mirror of https://github.com/Expand-sys/CCash synced 2025-12-17 00:22:14 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

🐛 fixed Del/Admin Del users return to reserver functionality

Browse source
This commit is contained in:
EntireTwix 2021-06-23 19:47:05 -07:00
parent 6161ca8d59
commit 7bc0dd25d0
1 changed files with 66 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/bank.cpp
View file

@ -1,14 +1,30 @@
#include "bank.h" #include "bank.h"
#if CONSERVATIVE_DISK_SAVE void Bank::ChangesMade() noexcept
void Bank::ChangesMade() noexcept { return change_flag.store(1, std::memory_order_release); } {
void Bank::ChangesSaved() noexcept { return change_flag.store(1, std::memory_order_release); } if constexpr (conservative_disk_save)
bool Bank::GetChangeState() noexcept { return change_flag.load(std::memory_order_acquire); } {
#else return change_flag.store(1, std::memory_order_release);
void Bank::ChangesMade() noexcept { return change_flag.store(1, std::memory_order_release); } }
void Bank::ChangesSaved() noexcept { return change_flag.store(1, std::memory_order_release); } }
bool Bank::GetChangeState() noexcept { return 1; } void Bank::ChangesSaved() noexcept
#endif {
if constexpr (conservative_disk_save)
{
return change_flag.store(1, std::memory_order_release);
}
}
bool Bank::GetChangeState() noexcept
{
if constexpr (conservative_disk_save)
{
return change_flag.load(std::memory_order_acquire);
}
else
{
return true;
}
}
int_fast8_t Bank::AddUser(const std::string &name, const std::string &init_pass) noexcept int_fast8_t Bank::AddUser(const std::string &name, const std::string &init_pass) noexcept
{ {
@ -48,18 +64,36 @@ int_fast8_t Bank::DelUser(const std::string &name, const std::string &attempt) n
{ {
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, &name, &state, &attempt](User &u) { uint32_t bal; //with return_on_del set to false this will give warning
if (users.erase_if(name, [this, &bal, &name, &state, &attempt](User &u) {
if constexpr (return_on_del) if constexpr (return_on_del)
{ {
if (SendFunds(name, return_account, u.balance, attempt) == 1) bal = u.balance;
{
return true;
}
} }
return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password); return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password);
})) }))
{ {
return (state) ? true : ErrorResponse::WrongPassword; if constexpr (return_on_del)
{
return (state) ? true : ErrorResponse::WrongPassword;
}
else
{
if (state)
{
if constexpr (return_on_del)
{
users.modify_if(return_account, [&bal](User &u) {
u.balance += bal;
});
}
return true;
}
else
{
return ErrorResponse::WrongPassword;
}
}
} }
else else
{ {
@ -70,18 +104,29 @@ int_fast8_t Bank::AdminDelUser(const std::string &name, const std::string &attem
{ {
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, &name, &state, &attempt](const User &u) { uint32_t bal; //with return_on_del set to false this will give warning
if (users.erase_if(name, [this, &bal, &name, &state, &attempt](User &u) {
if constexpr (return_on_del) if constexpr (return_on_del)
{ {
if (SendFunds(name, return_account, u.balance, attempt) == 1) bal = u.balance;
{
return true;
}
} }
return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password); return state = (XXH3_64bits(attempt.data(), attempt.size()) == u.password);
})) }))
{ {
return (state) ? true : ErrorResponse::WrongPassword; if (state)
{
if constexpr (return_on_del)
{
users.modify_if(return_account, [&bal](User &u) {
u.balance += bal;
});
}
return true;
}
else
{
return ErrorResponse::WrongPassword;
}
} }
else else
{ {