diff --git a/core/lib/env_config/src/fri_prover.rs b/core/lib/env_config/src/fri_prover.rs index 65d35a05d3e..41300402496 100644 --- a/core/lib/env_config/src/fri_prover.rs +++ b/core/lib/env_config/src/fri_prover.rs @@ -1,11 +1,11 @@ -use zksync_config::{configs::FriProverConfig, ObjectStoreConfig}; +use zksync_config::configs::FriProverConfig; -use crate::{envy_load, FromEnv}; +use crate::{envy_load, object_store::ProverObjectStoreConfig, FromEnv}; impl FromEnv for FriProverConfig { fn from_env() -> anyhow::Result { let mut prover: FriProverConfig = envy_load("fri_prover", "FRI_PROVER_")?; - prover.object_store = ObjectStoreConfig::from_env().ok(); + prover.object_store = ProverObjectStoreConfig::from_env().map(|a| a.0).ok(); Ok(prover) } } @@ -62,10 +62,10 @@ mod tests { FRI_PROVER_ZONE_READ_URL="http://metadata.google.internal/computeMetadata/v1/instance/zone" FRI_PROVER_SHALL_SAVE_TO_PUBLIC_BUCKET=true FRI_PROVER_AVAILABILITY_CHECK_INTERVAL_IN_SECS="1800" - OBJECT_STORE_BUCKET_BASE_URL="/base/url" - OBJECT_STORE_MODE="GCSWithCredentialFile" - OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json" - OBJECT_STORE_MAX_RETRIES="5" + PROVER_OBJECT_STORE_BUCKET_BASE_URL="/base/url" + PROVER_OBJECT_STORE_MODE="GCSWithCredentialFile" + PROVER_OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json" + PROVER_OBJECT_STORE_MAX_RETRIES="5" "#; lock.set_env(config);