gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

consolidate DEFAULT_HASHES_PER_TICK (#14463) (#15748)

Browse Source 
(cherry picked from commit 773b21b34e)

Co-authored-by: Jeff Washington (jwash) <75863576+jeffwashington@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2021-03-06 02:59:43 +00:00
committed by GitHub
parent 2114864626
commit 30781bb7b1
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/validator.rs
View File

@ -1598,10 +1598,7 @@ mod tests {
let poh_config = PohConfig {
target_tick_duration: Duration::from_millis(solana_sdk::clock::MS_PER_TICK),
// make PoH rate really fast to cause the panic condition
hashes_per_tick: Some(
100 * solana_sdk::clock::DEFAULT_HASHES_PER_SECOND
/ solana_sdk::clock::DEFAULT_TICKS_PER_SECOND,
),
hashes_per_tick: Some(100 * solana_sdk::clock::DEFAULT_HASHES_PER_TICK),
..PohConfig::default()
};
let genesis_config = GenesisConfig {

3
genesis/src/main.rs
View File

@ -463,8 +463,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
poh_config.hashes_per_tick = Some(hashes_per_tick);
}
ClusterType::Devnet | ClusterType::Testnet | ClusterType::MainnetBeta => {
poh_config.hashes_per_tick =
Some(clock::DEFAULT_HASHES_PER_SECOND / clock::DEFAULT_TICKS_PER_SECOND);
poh_config.hashes_per_tick = Some(clock::DEFAULT_HASHES_PER_TICK);
}
},
"sleep" => {

2
sdk/program/src/clock.rs
View File

@ -13,6 +13,8 @@ pub const DEFAULT_TICKS_PER_SLOT: u64 = 64;
// GCP n1-standard hardware and also a xeon e5-2520 v4 are about this rate of hashes/s
pub const DEFAULT_HASHES_PER_SECOND: u64 = 2_000_000;
pub const DEFAULT_HASHES_PER_TICK: u64 = DEFAULT_HASHES_PER_SECOND / DEFAULT_TICKS_PER_SECOND;
// 1 Dev Epoch = 400 ms * 8192 ~= 55 minutes
pub const DEFAULT_DEV_SLOTS_PER_EPOCH: u64 = 8192;