mirror of
https://git.wownero.com/wownero/wownero.git
synced 2024-08-15 01:03:23 +00:00
a few minor (but easy) performance tweaks
Found by codacy.com
This commit is contained in:
parent
3002307418
commit
611639710d
11 changed files with 21 additions and 21 deletions
|
@ -235,7 +235,7 @@ namespace tools
|
||||||
return encode(buf);
|
return encode(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool decode_addr(std::string addr, uint64_t& tag, std::string& data)
|
bool decode_addr(const std::string &addr, uint64_t& tag, std::string& data)
|
||||||
{
|
{
|
||||||
std::string addr_data;
|
std::string addr_data;
|
||||||
bool r = decode(addr, addr_data);
|
bool r = decode(addr, addr_data);
|
||||||
|
|
|
@ -41,6 +41,6 @@ namespace tools
|
||||||
bool decode(const std::string& enc, std::string& data);
|
bool decode(const std::string& enc, std::string& data);
|
||||||
|
|
||||||
std::string encode_addr(uint64_t tag, const std::string& data);
|
std::string encode_addr(uint64_t tag, const std::string& data);
|
||||||
bool decode_addr(std::string addr, uint64_t& tag, std::string& data);
|
bool decode_addr(const std::string &addr, uint64_t& tag, std::string& data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -322,7 +322,7 @@ namespace cryptonote {
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------
|
||||||
bool parse_hash256(const std::string str_hash, crypto::hash& hash)
|
bool parse_hash256(const std::string &str_hash, crypto::hash& hash)
|
||||||
{
|
{
|
||||||
std::string buf;
|
std::string buf;
|
||||||
bool res = epee::string_tools::parse_hexstr_to_binbuff(str_hash, buf);
|
bool res = epee::string_tools::parse_hexstr_to_binbuff(str_hash, buf);
|
||||||
|
|
|
@ -124,5 +124,5 @@ namespace cryptonote {
|
||||||
bool operator ==(const cryptonote::block& a, const cryptonote::block& b);
|
bool operator ==(const cryptonote::block& a, const cryptonote::block& b);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool parse_hash256(const std::string str_hash, crypto::hash& hash);
|
bool parse_hash256(const std::string &str_hash, crypto::hash& hash);
|
||||||
|
|
||||||
|
|
|
@ -929,7 +929,7 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain,
|
||||||
m_hardfork->reorganize_from_chain_height(rollback_height);
|
m_hardfork->reorganize_from_chain_height(rollback_height);
|
||||||
|
|
||||||
MINFO("Rollback to height " << rollback_height << " was successful.");
|
MINFO("Rollback to height " << rollback_height << " was successful.");
|
||||||
if (original_chain.size())
|
if (!original_chain.empty())
|
||||||
{
|
{
|
||||||
MINFO("Restoration to previous blockchain successful as well.");
|
MINFO("Restoration to previous blockchain successful as well.");
|
||||||
}
|
}
|
||||||
|
@ -1484,7 +1484,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
|
||||||
|
|
||||||
// if block to be added connects to known blocks that aren't part of the
|
// if block to be added connects to known blocks that aren't part of the
|
||||||
// main chain -- that is, if we're adding on to an alternate chain
|
// main chain -- that is, if we're adding on to an alternate chain
|
||||||
if(alt_chain.size())
|
if(!alt_chain.empty())
|
||||||
{
|
{
|
||||||
// make sure alt chain doesn't somehow start past the end of the main chain
|
// make sure alt chain doesn't somehow start past the end of the main chain
|
||||||
CHECK_AND_ASSERT_MES(m_db->height() > alt_chain.front()->second.height, false, "main blockchain wrong height");
|
CHECK_AND_ASSERT_MES(m_db->height() > alt_chain.front()->second.height, false, "main blockchain wrong height");
|
||||||
|
@ -1857,7 +1857,7 @@ bool Blockchain::find_blockchain_supplement(const std::list<crypto::hash>& qbloc
|
||||||
|
|
||||||
// make sure the request includes at least the genesis block, otherwise
|
// make sure the request includes at least the genesis block, otherwise
|
||||||
// how can we expect to sync from the client that the block list came from?
|
// how can we expect to sync from the client that the block list came from?
|
||||||
if(!qblock_ids.size())
|
if(qblock_ids.empty())
|
||||||
{
|
{
|
||||||
MCERROR("net.p2p", "Client sent wrong NOTIFY_REQUEST_CHAIN: m_block_ids.size()=" << qblock_ids.size() << ", dropping connection");
|
MCERROR("net.p2p", "Client sent wrong NOTIFY_REQUEST_CHAIN: m_block_ids.size()=" << qblock_ids.size() << ", dropping connection");
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -198,7 +198,7 @@ namespace cryptonote
|
||||||
return addr.m_view_public_key;
|
return addr.m_view_public_key;
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
bool construct_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, bool rct, rct::RangeProofType range_proof_type, rct::multisig_out *msout, bool shuffle_outs)
|
bool construct_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, bool rct, rct::RangeProofType range_proof_type, rct::multisig_out *msout, bool shuffle_outs)
|
||||||
{
|
{
|
||||||
hw::device &hwdev = sender_account_keys.get_device();
|
hw::device &hwdev = sender_account_keys.get_device();
|
||||||
|
|
||||||
|
@ -610,7 +610,7 @@ namespace cryptonote
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct, rct::RangeProofType range_proof_type, rct::multisig_out *msout)
|
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct, rct::RangeProofType range_proof_type, rct::multisig_out *msout)
|
||||||
{
|
{
|
||||||
hw::device &hwdev = sender_account_keys.get_device();
|
hw::device &hwdev = sender_account_keys.get_device();
|
||||||
hwdev.open_tx(tx_key);
|
hwdev.open_tx(tx_key);
|
||||||
|
@ -633,7 +633,7 @@ namespace cryptonote
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
bool construct_tx(const account_keys& sender_account_keys, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time)
|
bool construct_tx(const account_keys& sender_account_keys, std::vector<tx_source_entry>& sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time)
|
||||||
{
|
{
|
||||||
std::unordered_map<crypto::public_key, cryptonote::subaddress_index> subaddresses;
|
std::unordered_map<crypto::public_key, cryptonote::subaddress_index> subaddresses;
|
||||||
subaddresses[sender_account_keys.m_account_address.m_spend_public_key] = {0,0};
|
subaddresses[sender_account_keys.m_account_address.m_spend_public_key] = {0,0};
|
||||||
|
|
|
@ -89,9 +89,9 @@ namespace cryptonote
|
||||||
|
|
||||||
//---------------------------------------------------------------
|
//---------------------------------------------------------------
|
||||||
crypto::public_key get_destination_view_key_pub(const std::vector<tx_destination_entry> &destinations, const boost::optional<cryptonote::account_public_address>& change_addr);
|
crypto::public_key get_destination_view_key_pub(const std::vector<tx_destination_entry> &destinations, const boost::optional<cryptonote::account_public_address>& change_addr);
|
||||||
bool construct_tx(const account_keys& sender_account_keys, std::vector<tx_source_entry> &sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time);
|
bool construct_tx(const account_keys& sender_account_keys, std::vector<tx_source_entry> &sources, const std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time);
|
||||||
bool construct_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, rct::RangeProofType range_proof_type = rct::RangeProofBorromean, rct::multisig_out *msout = NULL, bool shuffle_outs = true);
|
bool construct_tx_with_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time, const crypto::secret_key &tx_key, const std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, rct::RangeProofType range_proof_type = rct::RangeProofBorromean, rct::multisig_out *msout = NULL, bool shuffle_outs = true);
|
||||||
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, std::vector<uint8_t> extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, rct::RangeProofType range_proof_type = rct::RangeProofBorromean, rct::multisig_out *msout = NULL);
|
bool construct_tx_and_get_tx_key(const account_keys& sender_account_keys, const std::unordered_map<crypto::public_key, subaddress_index>& subaddresses, std::vector<tx_source_entry>& sources, std::vector<tx_destination_entry>& destinations, const boost::optional<cryptonote::account_public_address>& change_addr, const std::vector<uint8_t> &extra, transaction& tx, uint64_t unlock_time, crypto::secret_key &tx_key, std::vector<crypto::secret_key> &additional_tx_keys, bool rct = false, rct::RangeProofType range_proof_type = rct::RangeProofBorromean, rct::multisig_out *msout = NULL);
|
||||||
|
|
||||||
bool generate_genesis_block(
|
bool generate_genesis_block(
|
||||||
block& bl
|
block& bl
|
||||||
|
|
|
@ -444,7 +444,7 @@ namespace rct {
|
||||||
// this shows that sum inputs = sum outputs
|
// this shows that sum inputs = sum outputs
|
||||||
//Ver:
|
//Ver:
|
||||||
// verifies the above sig is created corretly
|
// verifies the above sig is created corretly
|
||||||
mgSig proveRctMG(const key &message, const ctkeyM & pubs, const ctkeyV & inSk, const ctkeyV &outSk, const ctkeyV & outPk, const multisig_kLRki *kLRki, key *mscout, unsigned int index, key txnFeeKey, hw::device &hwdev) {
|
mgSig proveRctMG(const key &message, const ctkeyM & pubs, const ctkeyV & inSk, const ctkeyV &outSk, const ctkeyV & outPk, const multisig_kLRki *kLRki, key *mscout, unsigned int index, const key &txnFeeKey, hw::device &hwdev) {
|
||||||
mgSig mg;
|
mgSig mg;
|
||||||
//setup vars
|
//setup vars
|
||||||
size_t cols = pubs.size();
|
size_t cols = pubs.size();
|
||||||
|
@ -534,7 +534,7 @@ namespace rct {
|
||||||
// this shows that sum inputs = sum outputs
|
// this shows that sum inputs = sum outputs
|
||||||
//Ver:
|
//Ver:
|
||||||
// verifies the above sig is created corretly
|
// verifies the above sig is created corretly
|
||||||
bool verRctMG(const mgSig &mg, const ctkeyM & pubs, const ctkeyV & outPk, key txnFeeKey, const key &message) {
|
bool verRctMG(const mgSig &mg, const ctkeyM & pubs, const ctkeyV & outPk, const key &txnFeeKey, const key &message) {
|
||||||
PERF_TIMER(verRctMG);
|
PERF_TIMER(verRctMG);
|
||||||
//setup vars
|
//setup vars
|
||||||
size_t cols = pubs.size();
|
size_t cols = pubs.size();
|
||||||
|
|
|
@ -96,9 +96,9 @@ namespace rct {
|
||||||
// this shows that sum inputs = sum outputs
|
// this shows that sum inputs = sum outputs
|
||||||
//Ver:
|
//Ver:
|
||||||
// verifies the above sig is created corretly
|
// verifies the above sig is created corretly
|
||||||
mgSig proveRctMG(const ctkeyM & pubs, const ctkeyV & inSk, const keyV &outMasks, const ctkeyV & outPk, const multisig_kLRki *kLRki, key *mscout, unsigned int index, key txnFee, const key &message, hw::device &hwdev);
|
mgSig proveRctMG(const ctkeyM & pubs, const ctkeyV & inSk, const keyV &outMasks, const ctkeyV & outPk, const multisig_kLRki *kLRki, key *mscout, unsigned int index, const key &txnFee, const key &message, hw::device &hwdev);
|
||||||
mgSig proveRctMGSimple(const key & message, const ctkeyV & pubs, const ctkey & inSk, const key &a , const key &Cout, const multisig_kLRki *kLRki, key *mscout, unsigned int index, hw::device &hwdev);
|
mgSig proveRctMGSimple(const key & message, const ctkeyV & pubs, const ctkey & inSk, const key &a , const key &Cout, const multisig_kLRki *kLRki, key *mscout, unsigned int index, hw::device &hwdev);
|
||||||
bool verRctMG(const mgSig &mg, const ctkeyM & pubs, const ctkeyV & outPk, key txnFee, const key &message);
|
bool verRctMG(const mgSig &mg, const ctkeyM & pubs, const ctkeyV & outPk, const key &txnFee, const key &message);
|
||||||
bool verRctMGSimple(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C);
|
bool verRctMGSimple(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C);
|
||||||
|
|
||||||
//These functions get keys from blockchain
|
//These functions get keys from blockchain
|
||||||
|
|
|
@ -4292,7 +4292,7 @@ std::string wallet2::make_multisig(const epee::wipeable_string &password,
|
||||||
return make_multisig(password, secret_keys, public_keys, threshold);
|
return make_multisig(password, secret_keys, public_keys, threshold);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wallet2::finalize_multisig(const epee::wipeable_string &password, std::unordered_set<crypto::public_key> pkeys, std::vector<crypto::public_key> signers)
|
bool wallet2::finalize_multisig(const epee::wipeable_string &password, const std::unordered_set<crypto::public_key> &pkeys, std::vector<crypto::public_key> signers)
|
||||||
{
|
{
|
||||||
exchange_multisig_keys(password, pkeys, signers);
|
exchange_multisig_keys(password, pkeys, signers);
|
||||||
return true;
|
return true;
|
||||||
|
@ -10420,7 +10420,7 @@ const std::pair<std::map<std::string, std::string>, std::vector<std::string>>& w
|
||||||
return m_account_tags;
|
return m_account_tags;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wallet2::set_account_tag(const std::set<uint32_t> account_indices, const std::string& tag)
|
void wallet2::set_account_tag(const std::set<uint32_t> &account_indices, const std::string& tag)
|
||||||
{
|
{
|
||||||
for (uint32_t account_index : account_indices)
|
for (uint32_t account_index : account_indices)
|
||||||
{
|
{
|
||||||
|
|
|
@ -592,7 +592,7 @@ namespace tools
|
||||||
/*!
|
/*!
|
||||||
* \brief Finalizes creation of a multisig wallet
|
* \brief Finalizes creation of a multisig wallet
|
||||||
*/
|
*/
|
||||||
bool finalize_multisig(const epee::wipeable_string &password, std::unordered_set<crypto::public_key> pkeys, std::vector<crypto::public_key> signers);
|
bool finalize_multisig(const epee::wipeable_string &password, const std::unordered_set<crypto::public_key> &pkeys, std::vector<crypto::public_key> signers);
|
||||||
/*!
|
/*!
|
||||||
* Get a packaged multisig information string
|
* Get a packaged multisig information string
|
||||||
*/
|
*/
|
||||||
|
@ -1045,7 +1045,7 @@ namespace tools
|
||||||
* \param account_indices Indices of accounts.
|
* \param account_indices Indices of accounts.
|
||||||
* \param tag Tag's name. If empty, the accounts become untagged.
|
* \param tag Tag's name. If empty, the accounts become untagged.
|
||||||
*/
|
*/
|
||||||
void set_account_tag(const std::set<uint32_t> account_indices, const std::string& tag);
|
void set_account_tag(const std::set<uint32_t> &account_indices, const std::string& tag);
|
||||||
/*!
|
/*!
|
||||||
* \brief Set the label of the given tag.
|
* \brief Set the label of the given tag.
|
||||||
* \param tag Tag's name (which must be non-empty).
|
* \param tag Tag's name (which must be non-empty).
|
||||||
|
|
Loading…
Reference in a new issue