aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Blair <snipa@jagtech.io>2020-07-19 03:40:19 -0700
committerAlexander Blair <snipa@jagtech.io>2020-07-19 03:40:19 -0700
commit9871fefbf93fa12556bd80c355f6da9c028e4b69 (patch)
treef245c6308d326b04e0a7f4845fe0069ff6b78589
parentMerge pull request #6557 (diff)
parentfix a few typos in error messages (diff)
downloadmonero-9871fefbf93fa12556bd80c355f6da9c028e4b69.tar.xz
Merge pull request #6565
72cdfa4a2 fix a few typos in error messages (moneromooo-monero)
-rw-r--r--contrib/epee/src/net_ssl.cpp2
-rw-r--r--src/blockchain_db/lmdb/db_lmdb.cpp2
-rw-r--r--src/device/device_ledger.cpp8
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/epee/src/net_ssl.cpp b/contrib/epee/src/net_ssl.cpp
index 2cf9ea2b6..a09e82771 100644
--- a/contrib/epee/src/net_ssl.cpp
+++ b/contrib/epee/src/net_ssl.cpp
@@ -511,7 +511,7 @@ bool ssl_options_t::handshake(
// autodetect will reconnect without SSL - warn and keep connection encrypted
if (support != ssl_support_t::e_ssl_support_autodetect)
{
- MERROR("SSL certificate is not in the allowed list, connection droppped");
+ MERROR("SSL certificate is not in the allowed list, connection dropped");
return false;
}
MWARNING("SSL peer has not been verified");
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index 4e8da922e..6ea55d09d 100644
--- a/src/blockchain_db/lmdb/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
@@ -4115,7 +4115,7 @@ void BlockchainLMDB::get_output_tx_and_index_from_global(const std::vector<uint6
void BlockchainLMDB::get_output_key(const epee::span<const uint64_t> &amounts, const std::vector<uint64_t> &offsets, std::vector<output_data_t> &outputs, bool allow_partial) const
{
if (amounts.size() != 1 && amounts.size() != offsets.size())
- throw0(DB_ERROR("Invalid sizes of amounts and offets"));
+ throw0(DB_ERROR("Invalid sizes of amounts and offsets"));
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
TIME_MEASURE_START(db3);
diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp
index a6c2d96ed..4bd3d75b1 100644
--- a/src/device/device_ledger.cpp
+++ b/src/device/device_ledger.cpp
@@ -1108,7 +1108,7 @@ namespace hw {
for(size_t n=0; n < additional_derivations.size();++n) {
if(derivation == additional_derivations[n]) {
pkey = &additional_tx_pub_keys[n];
- MDEBUG("conceal derivation with additionnal tx pub key");
+ MDEBUG("conceal derivation with additional tx pub key");
break;
}
}
@@ -1640,20 +1640,20 @@ namespace hw {
//if (tx_version > 1)
{
- ASSERT_X(recv_len>=32, "Not enought data from device");
+ ASSERT_X(recv_len>=32, "Not enough data from device");
crypto::secret_key scalar1;
this->receive_secret((unsigned char*)scalar1.data, offset);
amount_keys.push_back(rct::sk2rct(scalar1));
recv_len -= 32;
}
- ASSERT_X(recv_len>=32, "Not enought data from device");
+ ASSERT_X(recv_len>=32, "Not enough data from device");
memmove(out_eph_public_key.data, &this->buffer_recv[offset], 32);
recv_len -= 32;
offset += 32;
if (need_additional_txkeys)
{
- ASSERT_X(recv_len>=32, "Not enought data from device");
+ ASSERT_X(recv_len>=32, "Not enough data from device");
memmove(additional_txkey.pub.data, &this->buffer_recv[offset], 32);
additional_tx_public_keys.push_back(additional_txkey.pub);
offset += 32;