cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

removed state-cache-size flag from beacon_node/src (#1120)

Browse Source 
* removed state-cache-size flag from beacon_node/src
* removed state-cache-size related lines from store/src/config.rs
This commit is contained in:
Thor Kamphefner 2020-05-14 14:34:24 +02:00 committed by GitHub
parent 637ba8120b
commit 01f42a4d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/src/cli.rs
View File

@ -229,13 +229,7 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
.help("Specifies how many blocks the database should cache in memory [default: 5]") .help("Specifies how many blocks the database should cache in memory [default: 5]")
.takes_value(true) .takes_value(true)
) )
.arg(
Arg::with_name("state-cache-size")
.long("state-cache-size")
.value_name("SIZE")
.help("Specifies how many states the database should cache in memory [default: 5]")
.takes_value(true)
)
/* /*
* Purge. * Purge.
*/ */

6
beacon_node/src/config.rs
View File

@ -311,12 +311,6 @@ pub fn get_config<E: EthSpec>(
.map_err(|_| "block-cache-size is not a valid integer".to_string())?; .map_err(|_| "block-cache-size is not a valid integer".to_string())?;
} }
if let Some(state_cache_size) = cli_args.value_of("state-cache-size") {
client_config.store.state_cache_size = state_cache_size
.parse()
.map_err(|_| "block-cache-size is not a valid integer".to_string())?;
}
if spec_constants != client_config.spec_constants { if spec_constants != client_config.spec_constants {
crit!(log, "Specification constants do not match."; crit!(log, "Specification constants do not match.";
"client_config" => client_config.spec_constants.to_string(), "client_config" => client_config.spec_constants.to_string(),

4
beacon_node/store/src/config.rs
View File

@ -3,7 +3,6 @@ use types::{EthSpec, MinimalEthSpec};
pub const DEFAULT_SLOTS_PER_RESTORE_POINT: u64 = 2048; pub const DEFAULT_SLOTS_PER_RESTORE_POINT: u64 = 2048;
pub const DEFAULT_BLOCK_CACHE_SIZE: usize = 5; pub const DEFAULT_BLOCK_CACHE_SIZE: usize = 5;
pub const DEFAULT_STATE_CACHE_SIZE: usize = 5;
/// Database configuration parameters. /// Database configuration parameters.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@ -12,8 +11,6 @@ pub struct StoreConfig {
pub slots_per_restore_point: u64, pub slots_per_restore_point: u64,
/// Maximum number of blocks to store in the in-memory block cache. /// Maximum number of blocks to store in the in-memory block cache.
pub block_cache_size: usize, pub block_cache_size: usize,
/// Maximum number of states to store in the in-memory state cache.
pub state_cache_size: usize,
} }
impl Default for StoreConfig { impl Default for StoreConfig {
@ -22,7 +19,6 @@ impl Default for StoreConfig {
// Safe default for tests, shouldn't ever be read by a CLI node. // Safe default for tests, shouldn't ever be read by a CLI node.
slots_per_restore_point: MinimalEthSpec::slots_per_historical_root() as u64, slots_per_restore_point: MinimalEthSpec::slots_per_historical_root() as u64,
block_cache_size: DEFAULT_BLOCK_CACHE_SIZE, block_cache_size: DEFAULT_BLOCK_CACHE_SIZE,
state_cache_size: DEFAULT_STATE_CACHE_SIZE,
} }
} }
} }