Merge pull request #10792

02db831 Fix spelling typos (Thomas)

ACKs: tobtoht, jeffro256

CMakeLists.txt

@@ -170,7 +170,7 @@ function (add_definition_if_library_exists library function header var)
   endif()
 endfunction()
 
-option(RELINK_TARGETS "Relink targets, when just a dependant .so changed, but not its header?" OFF)
+option(RELINK_TARGETS "Relink targets, when just a dependent .so changed, but not its header?" OFF)
 function (monero_set_target_no_relink target)
   if (RELINK_TARGETS MATCHES OFF)
     # Will not relink the target, when just its dependent .so has changed, but not its interface

contrib/epee/include/net/abstract_tcp_server2.inl

@@ -1453,7 +1453,7 @@ namespace net_utils
       }
       catch(...)
       {
-        _erro("Exception at server worker thread, unknown execption");
+        _erro("Exception at server worker thread, unknown exception");
       }
     }
     //_info("Worker thread finished");

contrib/epee/include/net/connection_basic.hpp

@@ -98,7 +98,7 @@ class connection_basic_pimpl; // PIMPL for this class
   
   std::string to_string(t_connection_type type);
 
-class connection_basic { // not-templated base class for rapid developmet of some code parts
+class connection_basic { // not-templated base class for rapid development of some code parts
 		// beware of removing const, net_utils::connection is sketchily doing a cast to prevent storing ptr twice
 		const std::shared_ptr<connection_basic_shared_state> m_state;
 	public:

contrib/epee/include/net/http_base.h

@@ -192,8 +192,8 @@ namespace net_utils
 			std::string			m_body;
 			std::string			m_mime_tipe;
 			http_header_info    m_header_info;
-			int                 m_http_ver_hi;// OUT paramter only
-			int                 m_http_ver_lo;// OUT paramter only
+			int                 m_http_ver_hi;// OUT parameter only
+			int                 m_http_ver_lo;// OUT parameter only
 
 			void clear()
 			{

contrib/epee/include/net/network_throttle-detail.hpp

@@ -92,7 +92,7 @@ class network_throttle : public i_network_throttle {
 		virtual void calculate_times(size_t packet_size, calculate_times_struct &cts, bool dbg, double force_window) const; ///< MAIN LOGIC (see base class for info)
 
 		virtual network_time_seconds get_sleep_time_after_tick(size_t packet_size); ///< increase the timer if needed, and get the package size
-		virtual network_time_seconds get_sleep_time(size_t packet_size) const; ///< gets the Delay (recommended Delay time) from calc. (not safe: only if time didnt change?) TODO
+		virtual network_time_seconds get_sleep_time(size_t packet_size) const; ///< gets the Delay (recommended Delay time) from calc. (not safe: only if time didn't change?) TODO
 
 		virtual size_t get_recommended_size_of_planned_transport() const; ///< what should be the size (bytes) of next data block to be transported
 		virtual size_t get_recommended_size_of_planned_transport_window(double force_window) const;  ///< ditto, but for given windows time frame
@@ -110,8 +110,8 @@ class network_throttle : public i_network_throttle {
 */
 struct network_throttle_bw {
 	public:
-		network_throttle m_in; ///< for incomming traffic (this we can not controll directly as it depends of what others send to us - usually)
-		network_throttle m_inreq; ///< for requesting incomming traffic (this is exact usually)
+		network_throttle m_in; ///< for incoming traffic (this we can not control directly as it depends of what others send to us - usually)
+		network_throttle m_inreq; ///< for requesting incoming traffic (this is exact usually)
 		network_throttle m_out; ///< for outgoing traffic that we just sent (this is exact usually)
 
 	public:

contrib/epee/include/serialization/wire/error.h

@@ -122,7 +122,7 @@ namespace wire
 
     std::error_code code() const noexcept override final
     {
-      static_assert(noexcept(noexcept(make_error_code(value))), "make_error_code funcion must be noexcept");
+      static_assert(noexcept(noexcept(make_error_code(value))), "make_error_code function must be noexcept");
       return make_error_code(value);
     }
   };

contrib/epee/include/serialization/wire/json/write.h

@@ -51,13 +51,13 @@ namespace wire
     static void Flush() noexcept {}
   };
 
-  //! Compatability/optimization for rapidjson.
+  //! Compatibility/optimization for rapidjson.
   inline void PutReserve(string_stream& dest, const std::size_t length)
   {
     dest.buffer_.reserve(length);
   }
 
-  //! Compability/optimization for rapidjson.
+  //! Compatibility/optimization for rapidjson.
   inline void PutN(string_stream& dest, const std::uint8_t ch, const std::size_t count)
   {
     dest.buffer_.append(count, ch);

contrib/epee/include/storages/portable_storage_from_bin.h

@@ -292,7 +292,7 @@ namespace epee
       RECURSION_LIMITATION();
       uint8_t ent_type = 0;
       read(ent_type);
-      CHECK_AND_ASSERT_THROW_MES(ent_type&SERIALIZE_FLAG_ARRAY, "wrong type sequenses");
+      CHECK_AND_ASSERT_THROW_MES(ent_type&SERIALIZE_FLAG_ARRAY, "wrong type sequences");
       return load_storage_array_entry(ent_type);
     }
 

contrib/epee/include/storages/portable_storage_from_json.h

@@ -188,7 +188,7 @@ namespace epee
           case match_state_wonder_array:
             if(*it == '[')
             {
-              ASSERT_MES_AND_THROW("array of array not suppoerted yet :( sorry"); 
+              ASSERT_MES_AND_THROW("array of array not supported yet :( sorry"); 
               //mean array of array
             }
             if(*it == '{')

contrib/epee/src/network_throttle-detail.cpp

@@ -266,7 +266,7 @@ void network_throttle::calculate_times(size_t packet_size, calculate_times_struc
 
 	if (!m_any_packet_yet) {
 		cts.window=0; cts.average=0; cts.delay=0; 
-		cts.recomendetDataSize = m_network_minimal_segment; // should be overrided by caller anyway
+		cts.recomendetDataSize = m_network_minimal_segment; // should be overridden by caller anyway
 		return ; // no packet yet, I can not decide about sleep time
 	}
 
@@ -288,7 +288,7 @@ void network_throttle::calculate_times(size_t packet_size, calculate_times_struc
 	const double D1 = (Epast - M*cts.window) / M; // delay - how long to sleep to get back to target speed
 	const double D2 = (Enow  - M*cts.window) / M; // delay - how long to sleep to get back to target speed (including current packet)
 
-    cts.delay = (D1*0.80 + D2*0.20); // finall sleep depends on both with/without current packet
+    cts.delay = (D1*0.80 + D2*0.20); // final sleep depends on both with/without current packet
 	//				update_overheat();
 	cts.average = Epast/cts.window; // current avg. speed (for info)
 

contrib/epee/src/parserse_base_utils.cpp

@@ -69,9 +69,9 @@ namespace misc_utils
         //  res+="\\'"; break;
         case '"':  //Double quote
           res+="\\\""; break;
-        case '\\':  //Backslash caracter
+        case '\\':  //Backslash character
           res+="\\\\"; break;
-        case '/':  //Backslash caracter
+        case '/':  //Backslash character
           res+="\\/"; break;
         default:
           res.push_back(*it);

src/blockchain_db/lmdb/db_lmdb.cpp

@@ -2579,7 +2579,7 @@ std::vector<uint64_t> BlockchainLMDB::get_block_cumulative_rct_outputs(const std
         range_begin = ((const mdb_block_info*)v.mv_data)->bi_height;
         range_end = range_begin + v.mv_size / sizeof(mdb_block_info); // whole records please
         if (height < range_begin || height >= range_end)
-          throw0(DB_ERROR(("Height " + std::to_string(height) + " not included in multuple record range: " + std::to_string(range_begin) + "-" + std::to_string(range_end)).c_str()));
+          throw0(DB_ERROR(("Height " + std::to_string(height) + " not included in multiple record range: " + std::to_string(range_begin) + "-" + std::to_string(range_end)).c_str()));
       }
       else
       {

src/common/password.h

@@ -50,7 +50,7 @@ namespace tools
     password_container(const epee::wipeable_string& password) noexcept;
 
     //! \return A password from stdin TTY prompt or `std::cin` pipe.
-    static boost::optional<password_container> prompt(bool verify, const char *mesage = "Password", bool hide_input = true);
+    static boost::optional<password_container> prompt(bool verify, const char *message = "Password", bool hide_input = true);
     static std::atomic<bool> is_prompting;
 
     password_container(const password_container&) = delete;

src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp

@@ -64,7 +64,7 @@
 
 namespace cryptonote {
 
-class cryptonote_protocol_handler_base_pimpl { // placeholer if needed
+class cryptonote_protocol_handler_base_pimpl { // placeholder if needed
 	public:
 
 };
@@ -78,7 +78,7 @@ class cryptonote_protocol_handler_base_pimpl { // placeholer if needed
 
 namespace cryptonote { 
 
-double cryptonote_protocol_handler_base::estimate_one_block_size() noexcept { // for estimating size of blocks to downloa
+double cryptonote_protocol_handler_base::estimate_one_block_size() noexcept { // for estimating size of blocks to download
  const double size_min = 500; // XXX 500
  //const int history_len = 20; // how many blocks to average over
 

src/cryptonote_protocol/cryptonote_protocol_handler.inl

@@ -327,7 +327,7 @@ namespace cryptonote
       << std::setw(20) << "Support Flags"      
       << std::setw(30) << "Recv/Sent (inactive,sec)"
       << std::setw(25) << "State"
-      << std::setw(20) << "Livetime(sec)"
+      << std::setw(20) << "Lifetime(sec)"
       << std::setw(12) << "Down (kB/s)"
       << std::setw(14) << "Down(now)"
       << std::setw(10) << "Up (kB/s)"

src/daemon/rpc_command_executor.cpp

@@ -654,7 +654,7 @@ bool t_rpc_command_executor::print_connections() {
       << std::setw(20) << "Support Flags"      
       << std::setw(30) << "Recv/Sent (inactive,sec)"
       << std::setw(25) << "State"
-      << std::setw(20) << "Livetime(sec)"
+      << std::setw(20) << "Lifetime(sec)"
       << std::setw(12) << "Down (kB/s)"
       << std::setw(14) << "Down(now)"
       << std::setw(10) << "Up (kB/s)" 
@@ -2035,7 +2035,7 @@ bool t_rpc_command_executor::alt_chain_info(const std::string &tip, size_t above
         if (start_difficulty > 0)
           tools::msg_writer() << "Approximated " << 100.f * DIFFICULTY_TARGET_V2 * chain.length / dt << "% of network hash rate";
         else
-          tools::fail_msg_writer() << "Bad cmumulative difficulty reported by dameon";
+          tools::fail_msg_writer() << "Bad cumulative difficulty reported by daemon";
       }
     }
     else

src/device_trezor/trezor/transport.cpp

@@ -415,7 +415,7 @@ namespace trezor{
     }
 
     if (!m_device_path){
-      throw exc::CommunicationException("Coud not open, empty device path");
+      throw exc::CommunicationException("Could not open, empty device path");
     }
 
     std::string uri = "/acquire/" + m_device_path.get() + "/null";

src/multisig/multisig_tx_builder_ringct.cpp

@@ -759,7 +759,7 @@ static bool set_tx_rct_signatures(
       rct::hash_to_p3(H_p3, rv.mixRing[i][l].dest);
       rct::key H_l;
       ge_p3_tobytes(H_l.bytes, &H_p3);
-      D = rct::scalarmultKey(H_l, z);  //auxilliary key image (for commitment to zero)
+      D = rct::scalarmultKey(H_l, z);  //auxiliary key image (for commitment to zero)
       rv.p.CLSAGs[i].D = rct::scalarmultKey(D, rct::INV_EIGHT);
       rv.p.CLSAGs[i].I = I;
     }

src/net/error.h

@@ -45,7 +45,7 @@ namespace net
         invalid_i2p_address,
         invalid_mask,       //!< Outside of 0-32 range
         invalid_port,       //!< Outside of 0-65535 range
-        invalid_scheme,     //!< Provided URI scheme was unspported
+        invalid_scheme,     //!< Provided URI scheme was unsupported
         invalid_tor_address,//!< Invalid base32 or length
         legacy_tor_address, //!< Legacy address type; not supported
         unexpected_userinfo,//!< User or pass was provided unexpectedly

src/net/i2p_address.cpp

@@ -72,7 +72,7 @@ namespace net
         struct i2p_serialized
         {
             std::string host;
-            std::uint16_t port; //! Leave for compatability with older clients
+            std::uint16_t port; //! Leave for compatibility with older clients
 
             BEGIN_KV_SERIALIZE_MAP()
                 KV_SERIALIZE(host)

src/p2p/net_node.inl

@@ -1294,7 +1294,7 @@ namespace nodetool
 
     const bool is_public = (zone == epee::net_utils::zone::public_);
     if(is_public && server->second.m_config.m_peer_id == peer.id)
-      return true;//dont make connections to ourself
+      return true;//don't make connections to ourself
 
     bool used = false;
     server->second.m_net_server.get_config_object().foreach_connection([&, is_public](const p2p_connection_context& cntxt)
@@ -1319,7 +1319,7 @@ namespace nodetool
 
     const bool is_public = (zone == epee::net_utils::zone::public_);
     if(is_public && server->second.m_config.m_peer_id == peer.id)
-      return true;//dont make connections to ourself
+      return true;//don't make connections to ourself
 
     bool used = false;
     server->second.m_net_server.get_config_object().foreach_connection([&, is_public](const p2p_connection_context& cntxt)

src/rpc/CMakeLists.txt

@@ -35,7 +35,7 @@ set(rpc_sources
   bootstrap_node_selector.cpp
   core_rpc_server.cpp
   rpc_version_str.cpp
-  instanciations.cpp)
+  instantiations.cpp)
 
 set(daemon_messages_sources
   message.cpp

src/rpc/core_rpc_server.cpp

@@ -2186,7 +2186,7 @@ namespace cryptonote
     if(!m_core.check_incoming_block_size(blockblob))
     {
       error_resp.code = CORE_RPC_ERROR_CODE_WRONG_BLOCKBLOB_SIZE;
-      error_resp.message = "Block bloc size is too big, rejecting block";
+      error_resp.message = "Block blob size is too big, rejecting block";
       return false;
     }
 

src/wallet/wallet2.cpp

@@ -9586,7 +9586,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
                     break;
                   }
                 }
-                THROW_WALLET_EXCEPTION_IF(!found, error::wallet_internal_error, "Falied to find existing ring output in daemon out data");
+                THROW_WALLET_EXCEPTION_IF(!found, error::wallet_internal_error, "Failed to find existing ring output in daemon out data");
               }
             }
           }

tests/core_tests/tx_pool.cpp

@@ -307,7 +307,7 @@ bool txpool_double_spend_base::check_changed(cryptonote::core& c, const size_t e
 
       if (!public_hashes.erase(hash))
       {
-        MERROR("An unexected transaction was returned from the public pool");
+        MERROR("An unexpected transaction was returned from the public pool");
         return false;
       }
     }
@@ -336,7 +336,7 @@ bool txpool_double_spend_base::check_changed(cryptonote::core& c, const size_t e
 
       if (!public_hashes.erase(hash))
       {
-        MERROR("An unexected transaction was returned from the public pool");
+        MERROR("An unexpected transaction was returned from the public pool");
         return false;
       }
     }
@@ -364,7 +364,7 @@ bool txpool_double_spend_base::check_changed(cryptonote::core& c, const size_t e
     {
       if (!all_hashes.erase(hash))
       {
-        MERROR("An unexected transaction was returned from the all pool");
+        MERROR("An unexpected transaction was returned from the all pool");
         return false;
       }
     }

tests/functional_tests/k_anonymity.py

@@ -307,7 +307,7 @@ class KAnonymityTest:
             ok = False
             try: res = daemon.get_txids_loose(txid_template, num_matching_bits)
             except: ok = True
-            assert ok, 'bad template didnt error: {} {}'.format(txid_template, num_matching_bits)
+            assert ok, 'bad template did not error: {} {}'.format(txid_template, num_matching_bits)
 
 if __name__ == '__main__':
     KAnonymityTest().run_test()

tests/functional_tests/multisig.py

@@ -496,7 +496,7 @@ class MultisigTest():
         assert frozen
 
         # Try signing multisig (this operation should fail b/c of the frozen key image)
-        print("Attemping to sign with frozen key image. This should fail")
+        print("Attempting to sign with frozen key image. This should fail")
         try:
           res = self.wallet[signers[1]].sign_multisig(multisig_txset)
           raise ValueError('sign_multisig should not have succeeded w/ frozen enotes')

tests/functional_tests/sign_message.py

@@ -67,7 +67,7 @@ class MessageSigningTest():
             assert res.seed == seeds[i]
 
     def check_signing(self, subaddress, spend_key):
-        print('Signing/verifing messages with ' + ('subaddress' if subaddress else 'standard address') + ' ' + ('spend key' if spend_key else 'view key'))
+        print('Signing/verifying messages with ' + ('subaddress' if subaddress else 'standard address') + ' ' + ('spend key' if spend_key else 'view key'))
         messages = ['foo', '']
         if subaddress:
             address = []

tests/functional_tests/util_resources.py

@@ -42,9 +42,9 @@ def get_time_pi_seconds(cores, app_dir='.'):
     app_path = '{}/cpu_power_test'.format(app_dir)
     time_calc = subprocess.check_output([app_path, str(cores)])
     decoded = time_calc.decode('utf-8')
-    miliseconds = int(decoded)
+    milliseconds = int(decoded)
 
-    return miliseconds / 1000.0
+    return milliseconds / 1000.0
 
 def remove_file(name):
     WALLET_DIRECTORY = os.environ['WALLET_DIRECTORY']

tests/trezor/trezor_tests.cpp

@@ -57,7 +57,7 @@ namespace
   const command_line::arg_descriptor<std::string> arg_trezor_path                 = {"trezor-path", "Path to the trezor device to use, has to support debug link", ""};
   const command_line::arg_descriptor<bool>        arg_heavy_tests                 = {"heavy-tests", "Runs expensive tests (volume tests)", false};
   const command_line::arg_descriptor<std::string> arg_chain_path                  = {"chain-path", "Path to the serialized blockchain, speeds up testing", ""};
-  const command_line::arg_descriptor<bool>        arg_fix_chain                   = {"fix-chain", "If chain-patch is given and file cannot be used, it is ignored and overwriten", false};
+  const command_line::arg_descriptor<bool>        arg_fix_chain                   = {"fix-chain", "If chain-patch is given and file cannot be used, it is ignored and overwritten", false};
 }
 
 #define HW_TREZOR_NAME "Trezor"

tests/unit_tests/epee_boosted_tcp_server.cpp

@@ -108,7 +108,7 @@ TEST(boosted_tcp_server, worker_threads_are_exception_resistant)
     }
   };
 
-  // 2 theads, but 4 exceptions
+  // 2 threads, but 4 exceptions
   ASSERT_TRUE(srv.run_server(2, false));
   ASSERT_TRUE(srv.async_call([&counter_incrementer]() { counter_incrementer(); throw std::runtime_error("test 1"); }));
   ASSERT_TRUE(srv.async_call([&counter_incrementer]() { counter_incrementer(); throw std::string("test 2"); }));

tests/unit_tests/json_serialization.cpp

@@ -130,7 +130,7 @@ namespace
             false, "compare_tx_to_json_tx: missing prefix members");
 
         // version
-        CHECK_AND_ASSERT_MES(tx_document["version"].IsInt(), false, "compare_tx_to_json_tx: version isnt integer");
+        CHECK_AND_ASSERT_MES(tx_document["version"].IsInt(), false, "compare_tx_to_json_tx: version isn't integer");
         CHECK_AND_ASSERT_MES(tx_document["version"].GetInt() == tx.version, false, "compare_tx_to_json_tx: wrong version");
 
         // unlock_time

tests/unit_tests/zmq_rpc.cpp

@@ -379,7 +379,7 @@ namespace
       const std::string endpoint = inproc_pub;
       pub = server.init_pub({std::addressof(endpoint), 1});
       if (!pub)
-        throw std::runtime_error{"failed to initiaze zmq/pub"};
+        throw std::runtime_error{"failed to initialize zmq/pub"};
 
       sub.reset(zmq_socket(ctx, ZMQ_SUB));
       if (!sub)

utils/health/valgrind-tests.sh

@@ -90,11 +90,11 @@ function run_valgrind_4_executable {
 	FILE_OUT_TOOL="${5}"
 	FILE_OUT_BASE=$(get_tool_out_file_base ${EXE} ${TOOL})
 
-	echo "Runnig '${TOOL}' for '${EXE}' with args '${ARGS}'"
+	echo "Running '${TOOL}' for '${EXE}' with args '${ARGS}'"
 	echo "EXTRA_OPTS = ${EXTRA_OPTS}"
 	echo "FILE_OUT_TOOL = ${FILE_OUT_TOOL}"
 	if ! valgrind --tool=${TOOL} ${FILE_OUT_TOOL} --log-file="${FILE_OUT_BASE}.log" ${EXTRA_OPTS} ${EXE} ${ARGS}; then
-		echo "FAILED in runnig ${TOOL} for ${EXE} !"
+		echo "FAILED in running ${TOOL} for ${EXE} !"
 	fi
 }