remove some unused code

Found by codacy.com

src/blockchain_utilities/blockchain_import.cpp

@@ -764,7 +764,7 @@ int main(int argc, char* argv[])
 #else
   const GetCheckpointsCallback& get_checkpoints = nullptr;
 #endif
-  if (!core.init(vm, nullptr, nullptr, get_checkpoints))
+  if (!core.init(vm, nullptr, get_checkpoints))
   {
     std::cerr << "Failed to initialize core" << ENDL;
     return 1;

src/common/dns_utils.cpp

@@ -305,7 +305,7 @@ std::vector<std::string> DNSResolver::get_record(const std::string& url, int rec
   // call DNS resolver, blocking.  if return value not zero, something went wrong
   if (!ub_resolve(m_data->m_ub_context, string_copy(url.c_str()), record_type, DNS_CLASS_IN, &result))
   {
-    dnssec_available = (result->secure || (!result->secure && result->bogus));
+    dnssec_available = (result->secure || result->bogus);
     dnssec_valid = result->secure && !result->bogus;
     if (result->havedata)
     {

src/cryptonote_core/cryptonote_core.cpp

@@ -389,7 +389,7 @@ namespace cryptonote
     return m_blockchain_storage.get_alternative_blocks_count();
   }
   //-----------------------------------------------------------------------------------------------
-  bool core::init(const boost::program_options::variables_map& vm, const char *config_subdir, const cryptonote::test_options *test_options, const GetCheckpointsCallback& get_checkpoints/* = nullptr */)
+  bool core::init(const boost::program_options::variables_map& vm, const cryptonote::test_options *test_options, const GetCheckpointsCallback& get_checkpoints/* = nullptr */)
   {
     start_time = std::time(nullptr);
 
@@ -399,10 +399,6 @@ namespace cryptonote
       m_nettype = FAKECHAIN;
     }
     bool r = handle_command_line(vm);
-    std::string m_config_folder_mempool = m_config_folder;
-
-    if (config_subdir)
-      m_config_folder_mempool = m_config_folder_mempool + "/" + config_subdir;
 
     std::string db_type = command_line::get_arg(vm, cryptonote::arg_db_type);
     std::string db_sync_mode = command_line::get_arg(vm, cryptonote::arg_db_sync_mode);
@@ -834,7 +830,7 @@ namespace cryptonote
     TRY_ENTRY();
     CRITICAL_REGION_LOCAL(m_incoming_tx_lock);
 
-    struct result { bool res; cryptonote::transaction tx; crypto::hash hash; crypto::hash prefix_hash; bool in_txpool; bool in_blockchain; };
+    struct result { bool res; cryptonote::transaction tx; crypto::hash hash; crypto::hash prefix_hash; };
     std::vector<result> results(tx_blobs.size());
 
     tvc.resize(tx_blobs.size());

src/cryptonote_core/cryptonote_core.h

@@ -242,13 +242,12 @@ namespace cryptonote
       * a miner instance with parameters given on the command line (or defaults)
       *
       * @param vm command line parameters
-      * @param config_subdir subdirectory for config storage
       * @param test_options configuration options for testing
       * @param get_checkpoints if set, will be called to get checkpoints data, must return checkpoints data pointer and size or nullptr if there ain't any checkpoints for specific network type
       *
       * @return false if one of the init steps fails, otherwise true
       */
-     bool init(const boost::program_options::variables_map& vm, const char *config_subdir = NULL, const test_options *test_options = NULL, const GetCheckpointsCallback& get_checkpoints = nullptr);
+     bool init(const boost::program_options::variables_map& vm, const test_options *test_options = NULL, const GetCheckpointsCallback& get_checkpoints = nullptr);
 
      /**
       * @copydoc Blockchain::reset_and_set_genesis_block

src/daemon/core.h

@@ -67,31 +67,16 @@ public:
     m_core.set_cryptonote_protocol(&protocol);
   }
 
-  std::string get_config_subdir() const
-  {
-    bool testnet = command_line::get_arg(m_vm_HACK, cryptonote::arg_testnet_on);
-    bool stagenet = command_line::get_arg(m_vm_HACK, cryptonote::arg_stagenet_on);
-    bool mainnet = !testnet && !stagenet;
-    std::string port = command_line::get_arg(m_vm_HACK, nodetool::arg_p2p_bind_port);
-    if ((mainnet && port != std::to_string(::config::P2P_DEFAULT_PORT))
-        || (testnet && port != std::to_string(::config::testnet::P2P_DEFAULT_PORT))
-        || (stagenet && port != std::to_string(::config::stagenet::P2P_DEFAULT_PORT))) {
-      return port;
-    }
-    return std::string();
-  }
-
   bool run()
   {
     //initialize core here
     MGINFO("Initializing core...");
-    std::string config_subdir = get_config_subdir();
 #if defined(PER_BLOCK_CHECKPOINT)
     const cryptonote::GetCheckpointsCallback& get_checkpoints = blocks::GetCheckpointsData;
 #else
     const cryptonote::GetCheckpointsCallback& get_checkpoints = nullptr;
 #endif
-    if (!m_core.init(m_vm_HACK, config_subdir.empty() ? NULL : config_subdir.c_str(), nullptr, get_checkpoints))
+    if (!m_core.init(m_vm_HACK, nullptr, get_checkpoints))
     {
       return false;
     }

src/device/device_ledger.cpp

@@ -789,8 +789,6 @@ namespace hw {
         }
 
         #ifdef DEBUG_HWDEVICE
-        bool recover_x = recover;
-        const crypto::secret_key recovery_key_x = recovery_key;
         crypto::public_key pub_x;
         crypto::secret_key sec_x;
         #endif

src/rpc/daemon_messages.cpp

@@ -177,8 +177,6 @@ rapidjson::Value GetTransactions::Request::toJson(rapidjson::Document& doc) cons
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, tx_hashes, tx_hashes);
 
   return val;
@@ -193,8 +191,6 @@ rapidjson::Value GetTransactions::Response::toJson(rapidjson::Document& doc) con
 {
   rapidjson::Value val(rapidjson::kObjectType);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, txs, txs);
   INSERT_INTO_JSON_OBJECT(val, doc, missed_hashes, missed_hashes);
 
@@ -212,8 +208,6 @@ rapidjson::Value KeyImagesSpent::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, key_images, key_images);
 
   return val;
@@ -228,8 +222,6 @@ rapidjson::Value KeyImagesSpent::Response::toJson(rapidjson::Document& doc) cons
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, spent_status, spent_status);
 
   return val;
@@ -245,8 +237,6 @@ rapidjson::Value GetTxGlobalOutputIndices::Request::toJson(rapidjson::Document&
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, tx_hash, tx_hash);
 
   return val;
@@ -261,8 +251,6 @@ rapidjson::Value GetTxGlobalOutputIndices::Response::toJson(rapidjson::Document&
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, output_indices, output_indices);
 
   return val;
@@ -277,8 +265,6 @@ rapidjson::Value SendRawTx::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, tx, tx);
   INSERT_INTO_JSON_OBJECT(val, doc, relay, relay);
 
@@ -295,8 +281,6 @@ rapidjson::Value SendRawTx::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, relayed, relayed);
 
   return val;
@@ -312,8 +296,6 @@ rapidjson::Value StartMining::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, miner_address, miner_address);
   INSERT_INTO_JSON_OBJECT(val, doc, threads_count, threads_count);
   INSERT_INTO_JSON_OBJECT(val, doc, do_background_mining, do_background_mining);
@@ -372,8 +354,6 @@ rapidjson::Value MiningStatus::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, active, active);
   INSERT_INTO_JSON_OBJECT(val, doc, speed, speed);
   INSERT_INTO_JSON_OBJECT(val, doc, threads_count, threads_count);
@@ -406,8 +386,6 @@ rapidjson::Value GetInfo::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, info, info);
 
   return val;
@@ -423,8 +401,6 @@ rapidjson::Value SaveBC::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   return val;
 }
 
@@ -436,8 +412,6 @@ rapidjson::Value SaveBC::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   return val;
 }
 
@@ -450,8 +424,6 @@ rapidjson::Value GetBlockHash::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, height, height);
 
   return val;
@@ -466,8 +438,6 @@ rapidjson::Value GetBlockHash::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, hash, hash);
 
   return val;
@@ -483,8 +453,6 @@ rapidjson::Value GetLastBlockHeader::Request::toJson(rapidjson::Document& doc) c
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   return val;
 }
 
@@ -496,8 +464,6 @@ rapidjson::Value GetLastBlockHeader::Response::toJson(rapidjson::Document& doc)
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, header, header);
 
   return val;
@@ -513,8 +479,6 @@ rapidjson::Value GetBlockHeaderByHash::Request::toJson(rapidjson::Document& doc)
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, hash, hash);
 
   return val;
@@ -529,8 +493,6 @@ rapidjson::Value GetBlockHeaderByHash::Response::toJson(rapidjson::Document& doc
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, header, header);
 
   return val;
@@ -546,8 +508,6 @@ rapidjson::Value GetBlockHeaderByHeight::Request::toJson(rapidjson::Document& do
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, height, height);
 
   return val;
@@ -562,8 +522,6 @@ rapidjson::Value GetBlockHeaderByHeight::Response::toJson(rapidjson::Document& d
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, header, header);
 
   return val;
@@ -579,8 +537,6 @@ rapidjson::Value GetBlockHeadersByHeight::Request::toJson(rapidjson::Document& d
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, heights, heights);
 
   return val;
@@ -595,8 +551,6 @@ rapidjson::Value GetBlockHeadersByHeight::Response::toJson(rapidjson::Document&
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, headers, headers);
 
   return val;
@@ -612,8 +566,6 @@ rapidjson::Value GetPeerList::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   return val;
 }
 
@@ -625,8 +577,6 @@ rapidjson::Value GetPeerList::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, white_list, white_list);
   INSERT_INTO_JSON_OBJECT(val, doc, gray_list, gray_list);
 
@@ -679,8 +629,6 @@ rapidjson::Value GetTransactionPool::Response::toJson(rapidjson::Document& doc)
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, transactions, transactions);
   INSERT_INTO_JSON_OBJECT(val, doc, key_images, key_images);
 
@@ -698,8 +646,6 @@ rapidjson::Value HardForkInfo::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, version, version);
 
   return val;
@@ -714,8 +660,6 @@ rapidjson::Value HardForkInfo::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, info, info);
 
   return val;
@@ -731,8 +675,6 @@ rapidjson::Value GetOutputHistogram::Request::toJson(rapidjson::Document& doc) c
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, amounts, amounts);
   INSERT_INTO_JSON_OBJECT(val, doc, min_count, min_count);
   INSERT_INTO_JSON_OBJECT(val, doc, max_count, max_count);
@@ -755,8 +697,6 @@ rapidjson::Value GetOutputHistogram::Response::toJson(rapidjson::Document& doc)
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, histogram, histogram);
 
   return val;
@@ -772,8 +712,6 @@ rapidjson::Value GetOutputKeys::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, outputs, outputs);
 
   return val;
@@ -788,8 +726,6 @@ rapidjson::Value GetOutputKeys::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, keys, keys);
 
   return val;
@@ -814,8 +750,6 @@ rapidjson::Value GetRPCVersion::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, version, version);
 
   return val;
@@ -830,8 +764,6 @@ rapidjson::Value GetFeeEstimate::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, num_grace_blocks, num_grace_blocks);
 
   return val;
@@ -846,8 +778,6 @@ rapidjson::Value GetFeeEstimate::Response::toJson(rapidjson::Document& doc) cons
 {
   auto val = Message::toJson(doc);
 
-  auto& al = doc.GetAllocator();
-
   INSERT_INTO_JSON_OBJECT(val, doc, estimated_base_fee, estimated_base_fee);
   INSERT_INTO_JSON_OBJECT(val, doc, fee_mask, fee_mask);
   INSERT_INTO_JSON_OBJECT(val, doc, size_scale, size_scale);
@@ -867,7 +797,6 @@ void GetFeeEstimate::Response::fromJson(rapidjson::Value& val)
 rapidjson::Value GetOutputDistribution::Request::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
-  auto& al = doc.GetAllocator();
 
   INSERT_INTO_JSON_OBJECT(val, doc, amounts, amounts);
   INSERT_INTO_JSON_OBJECT(val, doc, from_height, from_height);
@@ -888,7 +817,6 @@ void GetOutputDistribution::Request::fromJson(rapidjson::Value& val)
 rapidjson::Value GetOutputDistribution::Response::toJson(rapidjson::Document& doc) const
 {
   auto val = Message::toJson(doc);
-  auto& al = doc.GetAllocator();
 
   INSERT_INTO_JSON_OBJECT(val, doc, status, status);
   INSERT_INTO_JSON_OBJECT(val, doc, distributions, distributions);

src/simplewallet/simplewallet.cpp

@@ -6733,7 +6733,6 @@ static std::string get_human_readable_timestamp(uint64_t ts)
   gmtime_r(&tt, &tm);
 #endif
   uint64_t now = time(NULL);
-  uint64_t diff = ts > now ? ts - now : now - ts;
   strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &tm);
   return std::string(buffer);
 }

src/wallet/wallet2.cpp

@@ -1356,8 +1356,6 @@ void wallet2::scan_output(const cryptonote::transaction &tx, const crypto::publi
 //----------------------------------------------------------------------------------------------------
 void wallet2::cache_tx_data(const cryptonote::transaction& tx, const crypto::hash &txid, tx_cache_data &tx_cache_data) const
 {
-  const cryptonote::account_keys& keys = m_account.get_keys();
-
   if(!parse_tx_extra(tx.extra, tx_cache_data.tx_extra_fields))
   {
     // Extra may only be partially parsed, it's OK if tx_extra_fields contains public key
@@ -8105,7 +8103,6 @@ void wallet2::light_wallet_get_address_txs()
 
   // for balance calculation
   uint64_t wallet_total_sent = 0;
-  uint64_t wallet_total_unlocked_sent = 0;
   // txs in pool
   std::vector<crypto::hash> pool_txs;
 
@@ -11327,7 +11324,6 @@ cryptonote::blobdata wallet2::export_multisig()
   for (size_t n = 0; n < m_transfers.size(); ++n)
   {
     transfer_details &td = m_transfers[n];
-    const std::vector<crypto::public_key> additional_tx_pub_keys = get_additional_tx_pub_keys_from_extra(td.m_tx);
     crypto::key_image ki;
     td.m_multisig_k.clear();
     info[n].m_LR.clear();
@@ -11356,7 +11352,6 @@ cryptonote::blobdata wallet2::export_multisig()
   boost::archive::portable_binary_oarchive ar(oss);
   ar << info;
 
-  std::string magic(MULTISIG_EXPORT_FILE_MAGIC, strlen(MULTISIG_EXPORT_FILE_MAGIC));
   const cryptonote::account_public_address &keys = get_account().get_keys().m_account_address;
   std::string header;
   header += std::string((const char *)&keys.m_spend_public_key, sizeof(crypto::public_key));

tests/core_tests/chaingen.h

@@ -511,7 +511,7 @@ inline bool do_replay_events(std::vector<test_event_entry>& events)
   // FIXME: make sure that vm has arg_testnet_on set to true or false if
   // this test needs for it to be so.
   get_test_options<t_test_class> gto;
-  if (!c.init(vm, NULL, &gto.test_options))
+  if (!c.init(vm, &gto.test_options))
   {
     MERROR("Failed to init core");
     return false;

tests/core_tests/transaction_tests.cpp

@@ -54,9 +54,6 @@ bool test_transaction_generation_and_ring_signature()
   account_base miner_acc6;
   miner_acc6.generate();
 
-  std::string add_str = miner_acc3.get_public_address_str(MAINNET);
-
-
   account_base rv_acc;
   rv_acc.generate();
   account_base rv_acc2;

tests/unit_tests/mnemonics.cpp

@@ -75,7 +75,6 @@ namespace
    */
   void test_language(const Language::Base &language)
   {
-    const std::vector<std::string> &word_list = language.get_word_list();
     epee::wipeable_string w_seed = "", w_return_seed = "";
     std::string seed, return_seed;
     // Generate a random seed without checksum

tests/unit_tests/multisig.cpp

@@ -112,7 +112,7 @@ static void make_wallets(std::vector<tools::wallet2>& wallets, unsigned int M)
   }
 
   for (auto& wallet: wallets) {
-    ASSERT_FALSE(wallet.multisig() || wallet.multisig() || wallet.multisig());
+    ASSERT_FALSE(wallet.multisig());
   }
 
   std::vector<std::string> mxis;

tests/unit_tests/ringct.cpp

@@ -968,8 +968,6 @@ static rctSig make_sig()
 #define TEST_rctSig_elements(name, op) \
 TEST(ringct, rctSig_##name) \
 { \
-  const uint64_t inputs[] = {1000, 1000}; \
-  const uint64_t outputs[] = {1000, 1000}; \
   rct::rctSig sig = make_sig(); \
   ASSERT_TRUE(rct::verRct(sig)); \
   op; \