aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorPierre Boyer <pierre.s.boyer@gmail.com>2016-12-04 14:13:54 +0100
committerPierre Boyer <pierre.s.boyer@gmail.com>2016-12-04 14:13:54 +0100
commitf4772bae812cdab9cca3864d79cdbec7abe5a114 (patch)
tree434455673de9c67c5ed71c4d37a936610012df56 /src/wallet
parentMerge pull request #1372 (diff)
downloadmonero-f4772bae812cdab9cca3864d79cdbec7abe5a114.tar.xz
Fix a few minor typos
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/api/wallet.cpp2
-rw-r--r--src/wallet/wallet2.cpp8
-rw-r--r--src/wallet/wallet2.h2
-rw-r--r--src/wallet/wallet_rpc_server.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 215b61aef..8b873a7e2 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -521,7 +521,7 @@ bool WalletImpl::refresh()
void WalletImpl::refreshAsync()
{
- LOG_PRINT_L3(__FUNCTION__ << ": Refreshing asyncronously..");
+ LOG_PRINT_L3(__FUNCTION__ << ": Refreshing asynchronously..");
clearStatus();
m_refreshCV.notify_one();
}
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index ea3994435..4e200b544 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -2348,7 +2348,7 @@ void wallet2::load(const std::string& wallet_, const std::string& password)
}
//----------------------------------------------------------------------------------------------------
void wallet2::check_genesis(const crypto::hash& genesis_hash) const {
- std::string what("Genesis block missmatch. You probably use wallet without testnet flag with blockchain from test network or vice versa");
+ std::string what("Genesis block mismatch. You probably use wallet without testnet flag with blockchain from test network or vice versa");
THROW_WALLET_EXCEPTION_IF(genesis_hash != m_blockchain[0], error::wallet_internal_error, what);
}
@@ -3851,12 +3851,12 @@ static size_t estimate_rct_tx_size(int n_inputs, int mixin, int n_outputs)
return size;
}
-std::vector<size_t> wallet2::pick_prefered_rct_inputs(uint64_t needed_money) const
+std::vector<size_t> wallet2::pick_preferred_rct_inputs(uint64_t needed_money) const
{
std::vector<size_t> picks;
float current_output_relatdness = 1.0f;
- LOG_PRINT_L2("pick_prefered_rct_inputs: needed_money " << print_money(needed_money));
+ LOG_PRINT_L2("pick_preferred_rct_inputs: needed_money " << print_money(needed_money));
// try to find a rct input of enough size
for (size_t i = 0; i < m_transfers.size(); ++i)
@@ -4019,7 +4019,7 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
// this is used to build a tx that's 1 or 2 inputs, and 2 outputs, which
// will get us a known fee.
uint64_t estimated_fee = calculate_fee(fee_per_kb, estimate_rct_tx_size(2, fake_outs_count + 1, 2), fee_multiplier);
- prefered_inputs = pick_prefered_rct_inputs(needed_money + estimated_fee);
+ prefered_inputs = pick_preferred_rct_inputs(needed_money + estimated_fee);
if (!prefered_inputs.empty())
{
string s;
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index b6d3250b2..88fbe1eaf 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -590,7 +590,7 @@ namespace tools
uint64_t get_dynamic_per_kb_fee_estimate();
uint64_t get_per_kb_fee();
float get_output_relatedness(const transfer_details &td0, const transfer_details &td1) const;
- std::vector<size_t> pick_prefered_rct_inputs(uint64_t needed_money) const;
+ std::vector<size_t> pick_preferred_rct_inputs(uint64_t needed_money) const;
void set_spent(size_t idx, uint64_t height);
void set_unspent(size_t idx);
template<typename entry>
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index f1c3faa3e..2135e7b56 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -558,7 +558,7 @@ namespace tools
if(!epee::string_tools::parse_hexstr_to_binbuff(req.payment_id, payment_id_blob))
{
er.code = WALLET_RPC_ERROR_CODE_WRONG_PAYMENT_ID;
- er.message = "Payment ID has invald format";
+ er.message = "Payment ID has invalid format";
return false;
}