extract variable

matter-labs · Jun 23, 2020 · 32af2ea · 32af2ea
1 parent 7788f1c
commit 32af2ea
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/core/models/src/config_options.rs b/core/models/src/config_options.rs
@@ -140,6 +140,14 @@ impl ConfigurationOptions {
     pub fn from_env() -> Self {
         let mut available_block_chunk_sizes = block_chunk_sizes().to_vec();
         available_block_chunk_sizes.sort();
+
+        let max_miniblock_iterations_withdraw_block =
+            if env::var("WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS").is_ok() {
+                parse_env("WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS")
+            } else {
+                parse_env("MINIBLOCKS_ITERATIONS")
+            };
+
         Self {
             rest_api_server_address: parse_env("REST_API_BIND"),
             json_rpc_http_server_address: parse_env("HTTP_RPC_API_BIND"),
@@ -168,15 +176,7 @@ impl ConfigurationOptions {
             ticker_url: parse_env("TICKER_URL"),
             idle_provers: parse_env("IDLE_PROVERS"),
             max_miniblock_iterations: parse_env("MINIBLOCKS_ITERATIONS"),
-            max_miniblock_iterations_withdraw_block: if env::var(
-                "WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS",
-            )
-            .is_ok()
-            {
-                parse_env("WITHDRAW_BLOCK_MINIBLOCKS_ITERATIONS")
-            } else {
-                parse_env("MINIBLOCKS_ITERATIONS")
-            },
+            max_miniblock_iterations_withdraw_block,
         }
     }
 }