From 551cdc2da38dbd2ca1f07e9a49f9f2745f21556a Mon Sep 17 00:00:00 2001
From: Danil <deniallugo@gmail.com>
Date: Fri, 7 Jun 2024 11:40:18 +0200
Subject: [PATCH] fix(config): Fix object store (#2183)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.

---------

Signed-off-by: Danil <deniallugo@gmail.com>
---
 core/lib/env_config/src/fri_prover.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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<Self> {
         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);