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

🐛 fixing last commit

Browse source
This commit is contained in:
EntireTwix 2021-06-27 22:12:31 -07:00
parent 6e46cb8f7a
commit 0c34bc3689
3 changed files with 36 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/user.h
View file

@ -15,7 +15,9 @@ struct User
User(const std::string &init_pass);
User(uint32_t init_bal, const std::string &init_pass);
User(uint32_t init_bal, uint64_t init_pass);
#if MAX_LOG_SIZE > 0
User(uint32_t init_bal, uint64_t init_pass, const Json::Value &log_j);
#endif
Json::Value Serialize() const; //to be removed later
};

75
src/bank.cpp
View file

@ -15,12 +15,14 @@ BankResponse Bank::GetBal(const std::string &name) const noexcept
BankResponse Bank::GetLogs(const std::string &name) noexcept
{
BankResponse res;
#if MAX_LOG_SIZE > 0
if (!users.modify_if(name, [&res](User &u) {
res = {k200OK, u.log.GetLog()};
}))
{
return BankResponse(k404NotFound, "User not found");
}
#endif
return res;
}
BankResponse Bank::SendFunds(const std::string &a_name, const std::string &b_name, uint32_t amount) noexcept
@ -44,42 +46,13 @@ BankResponse Bank::SendFunds(const std::string &a_name, const std::string &b_nam
}
BankResponse state;
if constexpr (MAX_LOG_SIZE > 0)
{
Transaction temp(a_name, b_name, amount);
std::shared_lock<std::shared_mutex> lock{send_funds_l};
if (!users.modify_if(a_name, [&temp, &state, amount](User &a) {
//if A can afford it
if (a.balance < amount)
{
state = {k402PaymentRequired, "Sender has insufficient funds"};
}
else
{
a.balance -= amount;
a.log.AddTrans(Transaction(temp));
state = {k200OK, "Transfer successful!"};
}
}))
{
return {k404NotFound, "Sender does not exist"};
}
if (state.first == k200OK)
{
users.modify_if(b_name, [&temp, amount](User &b) {
b.balance += amount;
b.log.AddTrans(std::move(temp));
});
#if CONSERVATIVE_DISK_SAVE
save_flag.SetChangesOn();
std::shared_lock<std::shared_mutex> lock{send_funds_l};
#if MAX_LOG_SIZE > 0
Transaction temp(a_name, b_name, amount);
if (!users.modify_if(a_name, [&temp, &state, amount](User &a) {
#else
if (!users.modify_if(a_name, [&state, amount](User &a) {
#endif
}
return state;
}
else
{
std::shared_lock<std::shared_mutex> lock{send_funds_l};
users.modify_if(a_name, [this, &state, amount](User &a) {
//if A can afford it
if (a.balance < amount)
{
@ -88,20 +61,30 @@ BankResponse Bank::SendFunds(const std::string &a_name, const std::string &b_nam
else
{
a.balance -= amount;
#if MAX_LOG_SIZE > 0
a.log.AddTrans(Transaction(temp));
#endif
state = {k200OK, "Transfer successful!"};
}
});
if (state.first == k200OK)
{
users.modify_if(b_name, [&a_name, &b_name, amount](User &b) {
b.balance += amount;
});
#if CONSERVATIVE_DISK_SAVE
save_flag.SetChangesOn();
#endif
}
return state;
}))
{
return {k404NotFound, "Sender does not exist"};
}
if (state.first == k200OK)
{
#if MAX_LOG_SIZE > 0
users.modify_if(b_name, [&temp, amount](User &b) {
b.balance += amount;
b.log.AddTrans(std::move(temp)); });
#else
users.modify_if(b_name, [amount](User &b) { b.balance += amount; });
#endif
#if CONSERVATIVE_DISK_SAVE
save_flag.SetChangesOn();
#endif
}
return state;
}
bool Bank::VerifyPassword(const std::string &name, const std::string &attempt) const noexcept
{

9
src/user.cpp
View file

@ -22,6 +22,7 @@ User::User(uint32_t init_bal, const std::string &init_pass) : balance(init_bal),
* @param init_pass
*/
User::User(uint32_t init_bal, uint64_t init_pass) : balance(init_bal), password(init_pass) {}
#if MAX_LOG_SIZE > 0
User::User(uint32_t init_bal, uint64_t init_pass, const Json::Value &log_j) : balance(init_bal), password(init_pass)
{
if (log_j.size())
@ -41,15 +42,15 @@ User::User(uint32_t init_bal, uint64_t init_pass, const Json::Value &log_j) : ba
}
}
}
#endif
Json::Value User::Serialize() const
{
Json::Value res;
res["balance"] = (Json::UInt)balance;
res["password"] = (Json::UInt64)password;
if constexpr (MAX_LOG_SIZE > 0)
{
res["log"] = log.Serialize();
}
#if MAX_LOG_SIZE > 0
res["log"] = log.Serialize();
#endif
return res;
}