From 1c5f2e1ae6a3f407bc8882d6ca6e765ca2962678 Mon Sep 17 00:00:00 2001 From: EntireTwix Date: Fri, 2 Jul 2021 23:33:17 -0700 Subject: [PATCH] :racehorse: improved SendFunds() --- include/transaction.h | 4 ++-- src/bank.cpp | 10 +++++----- src/transaction.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/transaction.h b/include/transaction.h index ff7832d..3544a48 100644 --- a/include/transaction.h +++ b/include/transaction.h @@ -10,6 +10,6 @@ struct Transaction time_t time = 0; Transaction(); - Transaction(std::string &&from_str, std::string &&to_str, uint32_t amount, time_t time); - Transaction(std::string &&from_str, std::string &&to_str, uint32_t amount); + Transaction(const std::string &from_str, const std::string &to_str, uint32_t amount, time_t time); + Transaction(const std::string &from_str, const std::string &to_str, uint32_t amount); }; diff --git a/src/bank.cpp b/src/bank.cpp index fa2d4e3..59c2986 100644 --- a/src/bank.cpp +++ b/src/bank.cpp @@ -60,7 +60,7 @@ BankResponse Bank::SendFunds(const std::string &a_name, const std::string &b_nam BankResponse state; std::shared_lock lock{send_funds_l}; //about 10% of this function's cost #if MAX_LOG_SIZE > 0 - Transaction temp(std::string(a_name), std::string(b_name), amount); + 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) { @@ -120,11 +120,11 @@ BankResponse Bank::SetBal(const std::string &name, uint32_t amount) noexcept #if CONSERVATIVE_DISK_SAVE save_flag.SetChangesOn(); #endif - return BankResponse(k200OK, "Balance set!"); + return {k200OK, "Balance set!"}; } else { - return BankResponse(k404NotFound, "User not found"); + return {k404NotFound, "User not found"}; } } bool Bank::Contains(const std::string &name) const noexcept @@ -140,7 +140,7 @@ BankResponse Bank::AddUser(std::string &&name, std::string &&init_pass) noexcept { if (!ValidUsrname(name)) { - return BankResponse(k400BadRequest, "Invalid Name, breaks size and/or character restrictions"); + return {k400BadRequest, "Invalid Name, breaks size and/or character restrictions"}; } std::shared_lock lock{size_l}; @@ -153,7 +153,7 @@ BankResponse Bank::AdminAddUser(std::string &&name, uint32_t init_bal, std::stri { if (!ValidUsrname(name)) { - return BankResponse(k400BadRequest, "Invalid Name, breaks size and/or character restrictions"); + return {k400BadRequest, "Invalid Name, breaks size and/or character restrictions"}; } std::shared_lock lock{size_l}; diff --git a/src/transaction.cpp b/src/transaction.cpp index 6062ff8..5d45af7 100644 --- a/src/transaction.cpp +++ b/src/transaction.cpp @@ -1,5 +1,5 @@ #include "transaction.h" Transaction::Transaction() = default; -Transaction::Transaction(std::string &&from_str, std::string &&to_str, uint32_t amount, time_t time_val) : from(from_str), to(to_str), amount(amount), time(time_val) {} -Transaction::Transaction(std::string &&from_str, std::string &&to_str, uint32_t amount) : from(from_str), to(to_str), amount(amount) { time = std::time(NULL); } \ No newline at end of file +Transaction::Transaction(const std::string &from_str, const std::string &to_str, uint32_t amount, time_t time_val) : from(from_str), to(to_str), amount(amount), time(time_val) {} +Transaction::Transaction(const std::string &from_str, const std::string &to_str, uint32_t amount) : from(from_str), to(to_str), amount(amount) { time = std::time(NULL); } \ No newline at end of file