From 93ae98812b01cefbcdf4445ca500978844631f4b Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Mon, 19 Aug 2019 23:22:56 -0700 Subject: [PATCH] change DEFAULT_NUM_TICKS_PER_SECOND to DEFAULT_TICKS_PER_SECOND (#5559) --- client/src/rpc_client.rs | 10 +++++----- client/src/rpc_client_request.rs | 4 ++-- core/src/banking_stage.rs | 4 ++-- local_cluster/src/cluster_tests.rs | 4 ++-- sdk/src/fee_calculator.rs | 4 ++-- sdk/src/poh_config.rs | 4 ++-- sdk/src/timing.rs | 2 +- wallet/src/wallet.rs | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs index 426bae222..065b51f42 100644 --- a/client/src/rpc_client.rs +++ b/client/src/rpc_client.rs @@ -11,7 +11,7 @@ use solana_sdk::fee_calculator::FeeCalculator; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{KeypairUtil, Signature}; -use solana_sdk::timing::{DEFAULT_NUM_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; +use solana_sdk::timing::{DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; use solana_sdk::transaction::{self, Transaction, TransactionError}; use std::error; use std::io; @@ -135,7 +135,7 @@ impl RpcClient { if cfg!(not(test)) { // Retry ~twice during a slot sleep(Duration::from_millis( - 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_NUM_TICKS_PER_SECOND, + 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND, )); } }; @@ -181,7 +181,7 @@ impl RpcClient { // Delay ~1 tick between write transactions in an attempt to reduce AccountInUse errors // when all the write transactions modify the same program account (eg, deploying a // new program) - sleep(Duration::from_millis(1000 / DEFAULT_NUM_TICKS_PER_SECOND)); + sleep(Duration::from_millis(1000 / DEFAULT_TICKS_PER_SECOND)); } let signature = self.send_transaction(&transaction).ok(); @@ -195,7 +195,7 @@ impl RpcClient { if cfg!(not(test)) { // Retry ~twice during a slot sleep(Duration::from_millis( - 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_NUM_TICKS_PER_SECOND, + 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND, )); } @@ -387,7 +387,7 @@ impl RpcClient { // Retry ~twice during a slot sleep(Duration::from_millis( - 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_NUM_TICKS_PER_SECOND, + 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND, )); num_retries -= 1; } diff --git a/client/src/rpc_client_request.rs b/client/src/rpc_client_request.rs index a68f98b24..427eefb12 100644 --- a/client/src/rpc_client_request.rs +++ b/client/src/rpc_client_request.rs @@ -4,7 +4,7 @@ use crate::rpc_request::{RpcError, RpcRequest}; use log::*; use reqwest; use reqwest::header::CONTENT_TYPE; -use solana_sdk::timing::{DEFAULT_NUM_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; +use solana_sdk::timing::{DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; use std::thread::sleep; use std::time::Duration; @@ -73,7 +73,7 @@ impl GenericRpcClientRequest for RpcClientRequest { // Sleep for approximately half a slot sleep(Duration::from_millis( - 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_NUM_TICKS_PER_SECOND, + 500 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND, )); } } diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs index 38aa06759..d95397e33 100644 --- a/core/src/banking_stage.rs +++ b/core/src/banking_stage.rs @@ -25,7 +25,7 @@ use solana_runtime::locked_accounts_results::LockedAccountsResults; use solana_sdk::poh_config::PohConfig; use solana_sdk::pubkey::Pubkey; use solana_sdk::timing::{ - self, DEFAULT_NUM_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE, + self, DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE, MAX_TRANSACTION_FORWARDING_DELAY, }; use solana_sdk::transaction::{self, Transaction, TransactionError}; @@ -700,7 +700,7 @@ impl BankingStage { .saturating_sub(MAX_TRANSACTION_FORWARDING_DELAY) .saturating_sub( (FORWARD_TRANSACTIONS_TO_LEADER_AT_SLOT_OFFSET * bank.ticks_per_slot() - / DEFAULT_NUM_TICKS_PER_SECOND) as usize, + / DEFAULT_TICKS_PER_SECOND) as usize, ), &mut error_counters, ); diff --git a/local_cluster/src/cluster_tests.rs b/local_cluster/src/cluster_tests.rs index 8819b8bba..24271be49 100644 --- a/local_cluster/src/cluster_tests.rs +++ b/local_cluster/src/cluster_tests.rs @@ -20,14 +20,14 @@ use solana_sdk::{ signature::{Keypair, KeypairUtil, Signature}, system_transaction, timing::{ - duration_as_ms, DEFAULT_NUM_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, + duration_as_ms, DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT, NUM_CONSECUTIVE_LEADER_SLOTS, }, transport::TransportError, }; use std::{collections::HashSet, path::Path, thread::sleep, time::Duration}; -const DEFAULT_SLOT_MILLIS: u64 = (DEFAULT_TICKS_PER_SLOT * 1000) / DEFAULT_NUM_TICKS_PER_SECOND; +const DEFAULT_SLOT_MILLIS: u64 = (DEFAULT_TICKS_PER_SLOT * 1000) / DEFAULT_TICKS_PER_SECOND; /// Spend and verify from every node in the network pub fn spend_and_verify_all_nodes( diff --git a/sdk/src/fee_calculator.rs b/sdk/src/fee_calculator.rs index 0be45d627..652ec08b3 100644 --- a/sdk/src/fee_calculator.rs +++ b/sdk/src/fee_calculator.rs @@ -1,5 +1,5 @@ use crate::message::Message; -use crate::timing::{DEFAULT_NUM_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; +use crate::timing::{DEFAULT_TICKS_PER_SECOND, DEFAULT_TICKS_PER_SLOT}; use log::*; #[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)] @@ -28,7 +28,7 @@ pub struct FeeCalculator { /// TODO: determine good values for these pub const DEFAULT_TARGET_LAMPORTS_PER_SIGNATURE: u64 = 42; pub const DEFAULT_TARGET_SIGNATURES_PER_SLOT: usize = - 710_000 * DEFAULT_TICKS_PER_SLOT as usize / DEFAULT_NUM_TICKS_PER_SECOND as usize; + 710_000 * DEFAULT_TICKS_PER_SLOT as usize / DEFAULT_TICKS_PER_SECOND as usize; pub const DEFAULT_BURN_PERCENT: u8 = 127; impl Default for FeeCalculator { diff --git a/sdk/src/poh_config.rs b/sdk/src/poh_config.rs index 161010552..5c41acfb9 100644 --- a/sdk/src/poh_config.rs +++ b/sdk/src/poh_config.rs @@ -1,4 +1,4 @@ -use crate::timing::DEFAULT_NUM_TICKS_PER_SECOND; +use crate::timing::DEFAULT_TICKS_PER_SECOND; use std::time::Duration; #[derive(Serialize, Deserialize, Clone, Debug)] @@ -24,6 +24,6 @@ impl PohConfig { impl Default for PohConfig { fn default() -> Self { - Self::new_sleep(Duration::from_millis(1000 / DEFAULT_NUM_TICKS_PER_SECOND)) + Self::new_sleep(Duration::from_millis(1000 / DEFAULT_TICKS_PER_SECOND)) } } diff --git a/sdk/src/timing.rs b/sdk/src/timing.rs index a366e22c1..a4429f959 100644 --- a/sdk/src/timing.rs +++ b/sdk/src/timing.rs @@ -4,7 +4,7 @@ use std::time::{SystemTime, UNIX_EPOCH}; // The default tick rate that the cluster attempts to achieve. Note that the actual tick // rate at any given time should be expected to drift -pub const DEFAULT_NUM_TICKS_PER_SECOND: u64 = 10; +pub const DEFAULT_TICKS_PER_SECOND: u64 = 10; // At 10 ticks/s, 4 ticks per slot implies that leader rotation and voting will happen // every 400 ms. A fast voting cadence ensures faster finality and convergence diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index 7348ef610..573476f5c 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -1295,7 +1295,7 @@ fn process_ping( if signal_receiver .recv_timeout(Duration::from_millis( 500 * solana_sdk::timing::DEFAULT_TICKS_PER_SLOT - / solana_sdk::timing::DEFAULT_NUM_TICKS_PER_SECOND, + / solana_sdk::timing::DEFAULT_TICKS_PER_SECOND, )) .is_ok() {