consolidate DEFAULT_HASHES_PER_TICK (#14463)
This commit is contained in:
parent
938d482135
commit
773b21b34e
|
@ -1498,10 +1498,7 @@ mod tests {
|
||||||
let poh_config = PohConfig {
|
let poh_config = PohConfig {
|
||||||
target_tick_duration: Duration::from_millis(solana_sdk::clock::MS_PER_TICK),
|
target_tick_duration: Duration::from_millis(solana_sdk::clock::MS_PER_TICK),
|
||||||
// make PoH rate really fast to cause the panic condition
|
// make PoH rate really fast to cause the panic condition
|
||||||
hashes_per_tick: Some(
|
hashes_per_tick: Some(100 * solana_sdk::clock::DEFAULT_HASHES_PER_TICK),
|
||||||
100 * solana_sdk::clock::DEFAULT_HASHES_PER_SECOND
|
|
||||||
/ solana_sdk::clock::DEFAULT_TICKS_PER_SECOND,
|
|
||||||
),
|
|
||||||
..PohConfig::default()
|
..PohConfig::default()
|
||||||
};
|
};
|
||||||
let genesis_config = GenesisConfig {
|
let genesis_config = GenesisConfig {
|
||||||
|
|
|
@ -462,8 +462,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
|
||||||
poh_config.hashes_per_tick = Some(hashes_per_tick);
|
poh_config.hashes_per_tick = Some(hashes_per_tick);
|
||||||
}
|
}
|
||||||
ClusterType::Devnet | ClusterType::Testnet | ClusterType::MainnetBeta => {
|
ClusterType::Devnet | ClusterType::Testnet | ClusterType::MainnetBeta => {
|
||||||
poh_config.hashes_per_tick =
|
poh_config.hashes_per_tick = Some(clock::DEFAULT_HASHES_PER_TICK);
|
||||||
Some(clock::DEFAULT_HASHES_PER_SECOND / clock::DEFAULT_TICKS_PER_SECOND);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sleep" => {
|
"sleep" => {
|
||||||
|
|
|
@ -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
|
// 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_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
|
// 1 Dev Epoch = 400 ms * 8192 ~= 55 minutes
|
||||||
pub const DEFAULT_DEV_SLOTS_PER_EPOCH: u64 = 8192;
|
pub const DEFAULT_DEV_SLOTS_PER_EPOCH: u64 = 8192;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue