asymptotically
/
openmonero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

select_for_tx templated and new tests added

Browse Source
pull/93/merge
moneroexamples 6 years ago
parent d6e3e85b27
commit e77ec2309b
5 changed files with 163 additions and 129 deletions
Show Stats Download Patch File Download Diff File

134
src/MySqlAccounts.cpp
Unescape View File

@ -18,34 +18,6 @@ MysqlInputs::MysqlInputs(shared_ptr<MySqlConnector> _conn)
: conn {_conn}
{}
bool
MysqlInputs::select_for_tx(const uint64_t& address_id, vector<XmrInput>& ins)
{
Query query = conn->query(XmrInput::SELECT_STMT2);
query.parse();
try
{
query.storein(ins, address_id);
return !ins.empty();
}
catch (mysqlpp::Exception& e)
{
MYSQL_EXCEPTION_MSG(e);
//throw e;
}
catch (std::exception& e)
{
MYSQL_EXCEPTION_MSG(e);
//throw e;
}
return false;
}
bool
MysqlInputs::select_for_out(const uint64_t& output_id, vector<XmrInput>& ins)
{
@ -106,33 +78,6 @@ MysqlOutpus::select(uint64_t out_id, XmrOutput& out)
bool
MysqlOutpus::select_for_tx(const uint64_t& tx_id, vector<XmrOutput>& outs)
{
Query query = conn->query(XmrOutput::SELECT_STMT2);
query.parse();
try
{
query.storein(outs, tx_id);
return !outs.empty();
}
catch (mysqlpp::Exception& e)
{
MYSQL_EXCEPTION_MSG(e);
//throw e;
}
catch (std::exception& e)
{
MYSQL_EXCEPTION_MSG(e);
//throw e;
}
return false;
}
bool
MysqlOutpus::exist(const string& output_public_key_str, XmrOutput& out)
{
@ -383,49 +328,13 @@ bool
MySqlAccounts::select(const string& address, XmrAccount& account)
{
Query query = conn->query(XmrAccount::SELECT_STMT);
query.parse();
try
{
vector<XmrAccount> res;
query.storein(res, address);
if (!res.empty())
{
account = res.at(0);
return true;
}
}
catch (std::exception& e)
{
MYSQL_EXCEPTION_MSG(e);
//throw e;
}
return false;
}
bool
MySqlAccounts::select(const int64_t& acc_id, XmrAccount& account)
{
if (!conn->connect())
{
cerr << __FUNCTION__ << ":" << __LINE__
<< " failed connecting to mysql"
<< endl;
return false;
}
Query query = conn->query(XmrAccount::SELECT_STMT2);
query.parse();
try
{
vector<XmrAccount> res;
query.storein(res, acc_id);
query.storein(res, address);
if (!res.empty())
{
@ -509,11 +418,11 @@ uint64_t MySqlAccounts::insert<XmrOutput>(const vector<XmrOutput>& data_to_inser
template
uint64_t MySqlAccounts::insert<XmrInput>(const vector<XmrInput>& data_to_insert);
template <typename T>
template <typename T, size_t query_no>
bool
MySqlAccounts::select(uint64_t account_id, vector<T>& selected_data)
{
Query query = conn->query(T::SELECT_STMT);
Query query = conn->query((query_no == 1 ? T::SELECT_STMT : T::SELECT_STMT2));
query.parse();
try
@ -531,15 +440,40 @@ MySqlAccounts::select(uint64_t account_id, vector<T>& selected_data)
return false;
}
template
bool MySqlAccounts::select<XmrAccount>(uint64_t account_id, vector<XmrAccount>& selected_data);
template
bool MySqlAccounts::select<XmrTransaction>(uint64_t account_id, vector<XmrTransaction>& selected_data);
template
bool MySqlAccounts::select<XmrOutput>(uint64_t account_id, vector<XmrOutput>& selected_data);
template // this will use SELECT_STMT2 which selectes based on transaction id, not account_id,
bool MySqlAccounts::select<XmrOutput, 2>(uint64_t tx_id, vector<XmrOutput>& selected_data);
template
bool MySqlAccounts::select<XmrInput>(uint64_t account_id, vector<XmrInput>& selected_data);
template // this will use SELECT_STMT2 which selectes based on transaction id, not account_id,
bool MySqlAccounts::select<XmrInput, 2>(uint64_t tx_id, vector<XmrInput>& selected_data);
template <typename T>
bool
MySqlAccounts::select_for_tx(uint64_t tx_id, vector<T>& selected_data)
{
return select<T, 2>(tx_id, selected_data);
}
template // this will use SELECT_STMT2 which selectes based on transaction id, not account_id,
bool MySqlAccounts::select_for_tx<XmrOutput>(uint64_t tx_id, vector<XmrOutput>& selected_data);
template // this will use SELECT_STMT2 which selectes based on transaction id, not account_id,
bool MySqlAccounts::select_for_tx<XmrInput>(uint64_t tx_id, vector<XmrInput>& selected_data);
bool
MySqlAccounts::select_txs_for_account_spendability_check(
const uint64_t& account_id,
@ -645,18 +579,6 @@ MySqlAccounts::select_output_with_id(const uint64_t& out_id, XmrOutput& out)
return mysql_out->select(out_id, out);
}
bool
MySqlAccounts::select_outputs_for_tx(const uint64_t& tx_id, vector<XmrOutput>& outs)
{
return mysql_out->select_for_tx(tx_id, outs);
}
bool
MySqlAccounts::select_inputs_for_tx(const uint64_t& tx_id, vector<XmrInput>& ins)
{
return mysql_in->select_for_tx(tx_id, ins);
}
bool
MySqlAccounts::select_inputs_for_out(const uint64_t& output_id, vector<XmrInput>& ins)

29
src/MySqlAccounts.h
Unescape View File

@ -45,9 +45,6 @@ public:
bool
select(const uint64_t& address_id, vector<XmrInput>& ins);
bool
select_for_tx(const uint64_t& address_id, vector<XmrInput>& ins);
bool
select_for_out(const uint64_t& output_id, vector<XmrInput>& ins);
};
@ -66,9 +63,6 @@ public:
bool
select(uint64_t out_id, XmrOutput& outs);
bool
select_for_tx(const uint64_t& tx_id, vector<XmrOutput>& outs);
bool
exist(const string& output_public_key_str, XmrOutput& out);
};
@ -144,9 +138,6 @@ public:
bool
select(const string& address, XmrAccount& account);
bool
select(const int64_t& acc_id, XmrAccount& account);
template <typename T>
uint64_t
insert(const T& data_to_insert);
@ -155,10 +146,22 @@ public:
uint64_t
insert(const vector<T>& data_to_insert);
template <typename T>
/**
*
* @tparam T
* @tparam query_no which query to use, for SELECT_STMT or SELECT_STMT2
* @param account_id
* @param selected_data
* @return
*/
template <typename T, size_t query_no = 1>
bool
select(uint64_t account_id, vector<T>& selected_data);
template <typename T>
bool
select_for_tx(uint64_t tx_id, vector<T>& selected_data);
bool
select_txs_for_account_spendability_check(const uint64_t& account_id,
vector<XmrTransaction>& txs);
@ -166,12 +169,6 @@ public:
bool
select_output_with_id(const uint64_t& out_id, XmrOutput& out);
bool
select_outputs_for_tx(const uint64_t& tx_id, vector<XmrOutput>& outs);
bool
select_inputs_for_tx(const uint64_t& tx_id, vector<XmrInput>& ins);
bool
select_inputs_for_out(const uint64_t& output_id, vector<XmrInput>& ins);

8
src/YourMoneroRequests.cpp
Unescape View File

@ -248,7 +248,7 @@ YourMoneroRequests::get_address_txs(const shared_ptr< Session > session, const B
vector<XmrInput> inputs;
if (xmr_accounts->select_inputs_for_tx(tx.id.data, inputs))
if (xmr_accounts->select_for_tx(tx.id.data, inputs))
{
json j_spent_outputs = json::array();
@ -447,7 +447,7 @@ YourMoneroRequests::get_address_info(const shared_ptr< Session > session, const
{
vector<XmrOutput> outs;
if (xmr_accounts->select_outputs_for_tx(tx.id.data, outs))
if (xmr_accounts->select_for_tx(tx.id.data, outs))
{
for (XmrOutput &out: outs)
{
@ -598,7 +598,7 @@ YourMoneroRequests::get_unspent_outs(const shared_ptr< Session > session, const
vector<XmrOutput> outs;
if (xmr_accounts->select_outputs_for_tx(tx.id.data, outs))
if (xmr_accounts->select_for_tx(tx.id.data, outs))
{
for (XmrOutput &out: outs)
{
@ -1410,7 +1410,7 @@ YourMoneroRequests::get_tx(const shared_ptr< Session > session, const Bytes & bo
vector<XmrInput> inputs;
if (xmr_accounts->select_inputs_for_tx(xmr_tx.id.data, inputs))
if (xmr_accounts->select_for_tx(xmr_tx.id.data, inputs))
{
json j_spent_outputs = json::array();

7
src/ssqlses.h
Unescape View File

@ -43,15 +43,16 @@ sql_create_8(Accounts, 1, 6,
struct XmrAccount : public Accounts, Table
{
static constexpr const char* SELECT_STMT = R"(
SELECT * FROM `Accounts` WHERE `address` = (%0q)
SELECT * FROM `Accounts` WHERE `id` = (%0q)
)";
static constexpr const char* SELECT_STMT2 = R"(
SELECT * FROM `Accounts` WHERE `id` = (%0q)
SELECT * FROM `Accounts` WHERE `address` = (%0q)
)";
static constexpr const char* INSERT_STMT = R"(
INSERT INTO `Accounts` (`address`, `viewkey_hash`,
`scanned_block_height`,

114
tests/mysql_tests.cpp
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save