mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
various: remove unused variables
This commit is contained in:
parent
c83e80c263
commit
ef93b0995c
@ -1746,7 +1746,6 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO
|
|||||||
for (auto& bl: blocks)
|
for (auto& bl: blocks)
|
||||||
{
|
{
|
||||||
std::vector<crypto::hash> missed_tx_ids;
|
std::vector<crypto::hash> missed_tx_ids;
|
||||||
std::vector<cryptonote::blobdata> txs;
|
|
||||||
|
|
||||||
rsp.blocks.push_back(block_complete_entry());
|
rsp.blocks.push_back(block_complete_entry());
|
||||||
block_complete_entry& e = rsp.blocks.back();
|
block_complete_entry& e = rsp.blocks.back();
|
||||||
@ -1774,7 +1773,6 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO
|
|||||||
e.block = std::move(bl.first);
|
e.block = std::move(bl.first);
|
||||||
}
|
}
|
||||||
//get and pack other transactions, if needed
|
//get and pack other transactions, if needed
|
||||||
std::vector<cryptonote::blobdata> txs;
|
|
||||||
get_transactions_blobs(arg.txs, rsp.txs, rsp.missed_ids);
|
get_transactions_blobs(arg.txs, rsp.txs, rsp.missed_ids);
|
||||||
|
|
||||||
m_db->block_txn_stop();
|
m_db->block_txn_stop();
|
||||||
|
@ -275,7 +275,6 @@ namespace hw {
|
|||||||
|
|
||||||
int device_ledger::set_command_header(unsigned char ins, unsigned char p1, unsigned char p2) {
|
int device_ledger::set_command_header(unsigned char ins, unsigned char p1, unsigned char p2) {
|
||||||
reset_buffer();
|
reset_buffer();
|
||||||
int offset = 0;
|
|
||||||
this->buffer_send[0] = PROTOCOL_VERSION;
|
this->buffer_send[0] = PROTOCOL_VERSION;
|
||||||
this->buffer_send[1] = ins;
|
this->buffer_send[1] = ins;
|
||||||
this->buffer_send[2] = p1;
|
this->buffer_send[2] = p1;
|
||||||
@ -695,7 +694,7 @@ namespace hw {
|
|||||||
|
|
||||||
bool device_ledger::verify_keys(const crypto::secret_key &secret_key, const crypto::public_key &public_key) {
|
bool device_ledger::verify_keys(const crypto::secret_key &secret_key, const crypto::public_key &public_key) {
|
||||||
AUTO_LOCK_CMD();
|
AUTO_LOCK_CMD();
|
||||||
int offset, sw;
|
int offset;
|
||||||
|
|
||||||
offset = set_command_header_noopt(INS_VERIFY_KEY);
|
offset = set_command_header_noopt(INS_VERIFY_KEY);
|
||||||
//sec
|
//sec
|
||||||
@ -1567,7 +1566,6 @@ namespace hw {
|
|||||||
bool device_ledger::mlsag_prepare(const rct::key &H, const rct::key &xx,
|
bool device_ledger::mlsag_prepare(const rct::key &H, const rct::key &xx,
|
||||||
rct::key &a, rct::key &aG, rct::key &aHP, rct::key &II) {
|
rct::key &a, rct::key &aG, rct::key &aHP, rct::key &II) {
|
||||||
AUTO_LOCK_CMD();
|
AUTO_LOCK_CMD();
|
||||||
unsigned char options;
|
|
||||||
|
|
||||||
#ifdef DEBUG_HWDEVICE
|
#ifdef DEBUG_HWDEVICE
|
||||||
const rct::key H_x = H;
|
const rct::key H_x = H;
|
||||||
@ -1611,7 +1609,6 @@ namespace hw {
|
|||||||
|
|
||||||
bool device_ledger::mlsag_prepare(rct::key &a, rct::key &aG) {
|
bool device_ledger::mlsag_prepare(rct::key &a, rct::key &aG) {
|
||||||
AUTO_LOCK_CMD();
|
AUTO_LOCK_CMD();
|
||||||
unsigned char options;
|
|
||||||
|
|
||||||
#ifdef DEBUG_HWDEVICE
|
#ifdef DEBUG_HWDEVICE
|
||||||
rct::key a_x;
|
rct::key a_x;
|
||||||
@ -1634,7 +1631,6 @@ namespace hw {
|
|||||||
|
|
||||||
bool device_ledger::mlsag_hash(const rct::keyV &long_message, rct::key &c) {
|
bool device_ledger::mlsag_hash(const rct::keyV &long_message, rct::key &c) {
|
||||||
AUTO_LOCK_CMD();
|
AUTO_LOCK_CMD();
|
||||||
unsigned char options;
|
|
||||||
size_t cnt;
|
size_t cnt;
|
||||||
|
|
||||||
#ifdef DEBUG_HWDEVICE
|
#ifdef DEBUG_HWDEVICE
|
||||||
|
@ -469,7 +469,6 @@ namespace rct {
|
|||||||
//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, const 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;
|
|
||||||
//setup vars
|
//setup vars
|
||||||
size_t cols = pubs.size();
|
size_t cols = pubs.size();
|
||||||
CHECK_AND_ASSERT_THROW_MES(cols >= 1, "Empty pubs");
|
CHECK_AND_ASSERT_THROW_MES(cols >= 1, "Empty pubs");
|
||||||
@ -527,7 +526,6 @@ namespace rct {
|
|||||||
// a_out, Cout is for the output commitment
|
// a_out, Cout is for the output commitment
|
||||||
// index is the signing index..
|
// index is the signing index..
|
||||||
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) {
|
||||||
mgSig mg;
|
|
||||||
//setup vars
|
//setup vars
|
||||||
size_t rows = 1;
|
size_t rows = 1;
|
||||||
size_t cols = pubs.size();
|
size_t cols = pubs.size();
|
||||||
@ -793,7 +791,6 @@ namespace rct {
|
|||||||
rv.p.bulletproofs.clear();
|
rv.p.bulletproofs.clear();
|
||||||
if (bulletproof)
|
if (bulletproof)
|
||||||
{
|
{
|
||||||
std::vector<uint64_t> proof_amounts;
|
|
||||||
size_t n_amounts = outamounts.size();
|
size_t n_amounts = outamounts.size();
|
||||||
size_t amounts_proved = 0;
|
size_t amounts_proved = 0;
|
||||||
if (rct_config.range_proof_type == RangeProofPaddedBulletproof)
|
if (rct_config.range_proof_type == RangeProofPaddedBulletproof)
|
||||||
|
@ -563,7 +563,6 @@ void toJsonValue(rapidjson::Document& doc, const cryptonote::connection_info& in
|
|||||||
{
|
{
|
||||||
val.SetObject();
|
val.SetObject();
|
||||||
|
|
||||||
auto& al = doc.GetAllocator();
|
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, incoming, info.incoming);
|
INSERT_INTO_JSON_OBJECT(val, doc, incoming, info.incoming);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, localhost, info.localhost);
|
INSERT_INTO_JSON_OBJECT(val, doc, localhost, info.localhost);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, local_ip, info.local_ip);
|
INSERT_INTO_JSON_OBJECT(val, doc, local_ip, info.local_ip);
|
||||||
|
@ -1504,7 +1504,6 @@ PendingTransaction *WalletImpl::createSweepUnmixableTransaction()
|
|||||||
|
|
||||||
{
|
{
|
||||||
clearStatus();
|
clearStatus();
|
||||||
vector<cryptonote::tx_destination_entry> dsts;
|
|
||||||
cryptonote::tx_destination_entry de;
|
cryptonote::tx_destination_entry de;
|
||||||
|
|
||||||
PendingTransactionImpl * transaction = new PendingTransactionImpl(*this);
|
PendingTransactionImpl * transaction = new PendingTransactionImpl(*this);
|
||||||
|
@ -1528,7 +1528,6 @@ void wallet2::cache_tx_data(const cryptonote::transaction& tx, const crypto::has
|
|||||||
|
|
||||||
// additional tx pubkeys and derivations for multi-destination transfers involving one or more subaddresses
|
// additional tx pubkeys and derivations for multi-destination transfers involving one or more subaddresses
|
||||||
tx_extra_additional_pub_keys additional_tx_pub_keys;
|
tx_extra_additional_pub_keys additional_tx_pub_keys;
|
||||||
std::vector<crypto::key_derivation> additional_derivations;
|
|
||||||
if (find_tx_extra_field_by_type(tx_cache_data.tx_extra_fields, additional_tx_pub_keys))
|
if (find_tx_extra_field_by_type(tx_cache_data.tx_extra_fields, additional_tx_pub_keys))
|
||||||
{
|
{
|
||||||
for (size_t i = 0; i < additional_tx_pub_keys.data.size(); ++i)
|
for (size_t i = 0; i < additional_tx_pub_keys.data.size(); ++i)
|
||||||
|
@ -2192,9 +2192,6 @@ namespace tools
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
uint64_t received;
|
|
||||||
bool in_pool;
|
|
||||||
uint64_t confirmations;
|
|
||||||
res.good = m_wallet->check_tx_proof(txid, info.address, info.is_subaddress, req.message, req.signature, res.received, res.in_pool, res.confirmations);
|
res.good = m_wallet->check_tx_proof(txid, info.address, info.is_subaddress, req.message, req.signature, res.received, res.in_pool, res.confirmations);
|
||||||
}
|
}
|
||||||
catch (const std::exception &e)
|
catch (const std::exception &e)
|
||||||
@ -2911,8 +2908,6 @@ namespace tools
|
|||||||
std::vector<std::string> languages;
|
std::vector<std::string> languages;
|
||||||
crypto::ElectrumWords::get_language_list(languages);
|
crypto::ElectrumWords::get_language_list(languages);
|
||||||
std::vector<std::string>::iterator it;
|
std::vector<std::string>::iterator it;
|
||||||
std::string wallet_file;
|
|
||||||
char *ptr;
|
|
||||||
|
|
||||||
it = std::find(languages.begin(), languages.end(), req.language);
|
it = std::find(languages.begin(), languages.end(), req.language);
|
||||||
if (it == languages.end())
|
if (it == languages.end())
|
||||||
|
Loading…
Reference in New Issue
Block a user