aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-05-17 13:16:26 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-05-17 13:16:44 +0100
commitf278fe3883f7d708082a19856eda02fddaf2fc56 (patch)
tree7ed92fcdf936d3650ef4847ed1553b6fc44478b7
parentprint limits when running limit commands with no arguments (diff)
downloadmonero-f278fe3883f7d708082a19856eda02fddaf2fc56.tar.xz
s/terget/target/
-rw-r--r--src/p2p/connection_basic.cpp8
-rw-r--r--src/p2p/network_throttle-detail.cpp2
-rw-r--r--src/p2p/network_throttle-detail.hpp2
-rw-r--r--src/p2p/network_throttle.hpp2
-rw-r--r--tests/functional_tests/transactions_flow_test.cpp10
-rw-r--r--tests/functional_tests/transactions_flow_test.h2
6 files changed, 13 insertions, 13 deletions
diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp
index adf159dc0..d3f6415c5 100644
--- a/src/p2p/connection_basic.cpp
+++ b/src/p2p/connection_basic.cpp
@@ -203,7 +203,7 @@ uint64_t connection_basic::get_rate_up_limit() {
uint64_t limit;
{
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out );
- limit = network_throttle_manager::get_global_throttle_out().get_terget_speed();
+ limit = network_throttle_manager::get_global_throttle_out().get_target_speed();
}
return limit;
}
@@ -212,7 +212,7 @@ uint64_t connection_basic::get_rate_down_limit() {
uint64_t limit;
{
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in );
- limit = network_throttle_manager::get_global_throttle_in().get_terget_speed();
+ limit = network_throttle_manager::get_global_throttle_in().get_target_speed();
}
return limit;
}
@@ -224,12 +224,12 @@ void connection_basic::save_limit_to_file(int limit) {
{
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out );
- epee::net_utils::data_logger::get_instance().add_data("upload_limit", network_throttle_manager::get_global_throttle_out().get_terget_speed() / 1024);
+ epee::net_utils::data_logger::get_instance().add_data("upload_limit", network_throttle_manager::get_global_throttle_out().get_target_speed() / 1024);
}
{
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in );
- epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_terget_speed() / 1024);
+ epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_target_speed() / 1024);
}
}
diff --git a/src/p2p/network_throttle-detail.cpp b/src/p2p/network_throttle-detail.cpp
index 6fa27b62a..6e6989d44 100644
--- a/src/p2p/network_throttle-detail.cpp
+++ b/src/p2p/network_throttle-detail.cpp
@@ -172,7 +172,7 @@ void network_throttle::set_real_target_speed( network_speed_kbps real_target )
m_real_target_speed = real_target * 1024;
}
-network_speed_kbps network_throttle::get_terget_speed()
+network_speed_kbps network_throttle::get_target_speed()
{
return m_real_target_speed / 1024;
}
diff --git a/src/p2p/network_throttle-detail.hpp b/src/p2p/network_throttle-detail.hpp
index 063dac850..9f0003332 100644
--- a/src/p2p/network_throttle-detail.hpp
+++ b/src/p2p/network_throttle-detail.hpp
@@ -81,7 +81,7 @@ class network_throttle : public i_network_throttle {
virtual void set_name(const std::string &name);
virtual void set_target_speed( network_speed_kbps target );
virtual void set_real_target_speed( network_speed_kbps real_target ); // only for throttle_out
- virtual network_speed_kbps get_terget_speed();
+ virtual network_speed_kbps get_target_speed();
// add information about events:
virtual void handle_trafic_exact(size_t packet_size); ///< count the new traffic/packet; the size is exact considering all network costs
diff --git a/src/p2p/network_throttle.hpp b/src/p2p/network_throttle.hpp
index add4daa86..b93cfc563 100644
--- a/src/p2p/network_throttle.hpp
+++ b/src/p2p/network_throttle.hpp
@@ -147,7 +147,7 @@ class i_network_throttle {
virtual void set_name(const std::string &name)=0;
virtual void set_target_speed( network_speed_kbps target )=0;
virtual void set_real_target_speed(network_speed_kbps real_target)=0;
- virtual network_speed_kbps get_terget_speed()=0;
+ virtual network_speed_kbps get_target_speed()=0;
virtual void handle_trafic_exact(size_t packet_size) =0; // count the new traffic/packet; the size is exact considering all network costs
virtual void handle_trafic_tcp(size_t packet_size) =0; // count the new traffic/packet; the size is as TCP, we will consider MTU etc
diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp
index 5d88b65f2..5d276ec2a 100644
--- a/tests/functional_tests/transactions_flow_test.cpp
+++ b/tests/functional_tests/transactions_flow_test.cpp
@@ -112,7 +112,7 @@ uint64_t get_money_in_first_transfers(const tools::wallet2::transfer_container&
bool transactions_flow_test(std::string& working_folder,
std::string path_source_wallet,
- std::string path_terget_wallet,
+ std::string path_target_wallet,
std::string& daemon_addr_a,
std::string& daemon_addr_b,
uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second)
@@ -122,14 +122,14 @@ bool transactions_flow_test(std::string& working_folder,
if(path_source_wallet.empty())
path_source_wallet = generate_random_wallet_name();
- if(path_terget_wallet.empty())
- path_terget_wallet = generate_random_wallet_name();
+ if(path_target_wallet.empty())
+ path_target_wallet = generate_random_wallet_name();
try
{
w1.generate(working_folder + "/" + path_source_wallet, "");
- w2.generate(working_folder + "/" + path_terget_wallet, "");
+ w2.generate(working_folder + "/" + path_target_wallet, "");
}
catch (const std::exception& e)
{
@@ -152,7 +152,7 @@ bool transactions_flow_test(std::string& working_folder,
LOG_PRINT_GREEN("Using wallets: " << ENDL
<< "Source: " << w1.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_source_wallet << ENDL
- << "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_terget_wallet, LOG_LEVEL_1);
+ << "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_target_wallet, LOG_LEVEL_1);
//lets do some money
epee::net_utils::http::http_simple_client http_client;
diff --git a/tests/functional_tests/transactions_flow_test.h b/tests/functional_tests/transactions_flow_test.h
index 0d2f28700..95c8b397e 100644
--- a/tests/functional_tests/transactions_flow_test.h
+++ b/tests/functional_tests/transactions_flow_test.h
@@ -30,7 +30,7 @@
bool transactions_flow_test(std::string& working_folder,
std::string path_source_wallet,
- std::string path_terget_wallet,
+ std::string path_target_wallet,
std::string& daemon_addr_a,
std::string& daemon_addr_b,
uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second);