Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adapt zksync_env_config::chain tests for running both in Validium mode and Rollup mode #143

Merged
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 55 additions & 6 deletions core/lib/env_config/src/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ mod tests {
assert_eq!(actual, expected_network_config());
}

fn expected_state_keeper_config() -> StateKeeperConfig {
fn expected_state_keeper_config_rollup() -> StateKeeperConfig {
StateKeeperConfig {
transaction_slots: 50,
block_commit_deadline_ms: 2500,
Expand Down Expand Up @@ -98,10 +98,43 @@ mod tests {
}
}

fn expected_state_keeper_config_validium() -> StateKeeperConfig {
StateKeeperConfig {
transaction_slots: 50,
block_commit_deadline_ms: 2500,
miniblock_commit_deadline_ms: 1000,
miniblock_seal_queue_capacity: 10,
max_single_tx_gas: 1_000_000,
max_allowed_l2_tx_gas_limit: 2_000_000_000,
close_block_at_eth_params_percentage: 0.2,
close_block_at_gas_percentage: 0.8,
close_block_at_geometry_percentage: 0.5,
reject_tx_at_eth_params_percentage: 0.8,
reject_tx_at_geometry_percentage: 0.3,
fee_account_addr: addr("de03a0B5963f75f1C8485B355fF6D30f3093BDE7"),
reject_tx_at_gas_percentage: 0.5,
minimal_l2_gas_price: 100000000,
compute_overhead_part: 0.0,
pubdata_overhead_part: 1.0,
batch_overhead_l1_gas: 800_000,
max_gas_per_batch: 200_000_000,
max_pubdata_per_batch: 100_000,
fee_model_version: FeeModelVersion::V2,
validation_computational_gas_limit: 10_000_000,
save_call_traces: false,
virtual_blocks_interval: 1,
virtual_blocks_per_miniblock: 1,
upload_witness_inputs_to_gcs: false,
enum_index_migration_chunk_size: Some(2_000),
l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode::Validium,
}
}

#[test]
fn state_keeper_from_env() {
let mut lock = MUTEX.lock();
let config = r#"

let config_mock = r#"
CHAIN_STATE_KEEPER_TRANSACTION_SLOTS="50"
CHAIN_STATE_KEEPER_FEE_ACCOUNT_ADDR="0xde03a0B5963f75f1C8485B355fF6D30f3093BDE7"
CHAIN_STATE_KEEPER_MAX_SINGLE_TX_GAS="1000000"
Expand All @@ -126,12 +159,28 @@ mod tests {
CHAIN_STATE_KEEPER_SAVE_CALL_TRACES="false"
CHAIN_STATE_KEEPER_UPLOAD_WITNESS_INPUTS_TO_GCS="false"
CHAIN_STATE_KEEPER_ENUM_INDEX_MIGRATION_CHUNK_SIZE="2000"
CHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE=Rollup
"#;
lock.set_env(config);

let actual = StateKeeperConfig::from_env().unwrap();
assert_eq!(actual, expected_state_keeper_config());
// Test Rollup Configuration
let config_mock_rollup = format!(
"{}\nCHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE=Rollup",
config_mock
);
lock.set_env(&config_mock_rollup);
let current_config_rollup = StateKeeperConfig::from_env().unwrap();
assert_eq!(current_config_rollup, expected_state_keeper_config_rollup());

// Test Validium Configuration
let config_mock_validium = format!(
"{}\nCHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE=Validium",
config_mock
);
lock.set_env(&config_mock_validium);
let current_config_validium = StateKeeperConfig::from_env().unwrap();
assert_eq!(
current_config_validium,
expected_state_keeper_config_validium()
);
}

fn expected_operations_manager_config() -> OperationsManagerConfig {
Expand Down
Loading