Skip to content

Commit aa3b5f7

Browse files
committed
fix comment
1 parent 019c2ab commit aa3b5f7

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

orchestrator/src/core/config.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use crate::{
4343
};
4444

4545
use crate::types::batch::AggregatorBatchWeights;
46-
use blockifier::blockifier_versioned_constants::VersionedConstants;
4746
use blockifier::bouncer::BouncerWeights;
4847

4948
/// Starknet versions supported by the service
@@ -121,8 +120,6 @@ pub struct ConfigParam {
121120
/// * Aggregator Proof
122121
pub store_audit_artifacts: bool,
123122
pub bouncer_weights_limit: BouncerWeights,
124-
/// Optional versioned constants loaded from file. If None, defaults from blockifier will be used.
125-
pub versioned_constants: Option<VersionedConstants>,
126123
pub aggregator_batch_weights_limit: AggregatorBatchWeights,
127124
}
128125

@@ -212,17 +209,14 @@ impl Config {
212209

213210
let layer = run_cmd.layer.clone();
214211

215-
let snos_config = SNOSParams::from(run_cmd.snos_args.clone());
216-
let versioned_constants = snos_config.versioned_constants.clone();
217-
218212
let params = ConfigParam {
219213
madara_rpc_url: run_cmd.madara_rpc_url.clone(),
220214
madara_feeder_gateway_url: run_cmd
221215
.madara_feeder_gateway_url
222216
.clone()
223217
.unwrap_or_else(|| run_cmd.madara_rpc_url.clone()),
224218
madara_version: run_cmd.madara_version,
225-
snos_config,
219+
snos_config: SNOSParams::from(run_cmd.snos_args.clone()),
226220
batching_config: BatchingParams::from(run_cmd.batching_args.clone()),
227221
service_config: ServiceParams::from(run_cmd.service_args.clone()),
228222
server_config: ServerParams::from(run_cmd.server_args.clone()),
@@ -231,9 +225,8 @@ impl Config {
231225
prover_layout_name: Self::get_layout_name(run_cmd.proving_layout_args.prover_layout_name.clone().as_str())
232226
.context("Failed to get prover layout name")?,
233227
store_audit_artifacts: run_cmd.store_audit_artifacts,
234-
bouncer_weights_limit: Self::load_bouncer_weights_limit(&run_cmd.bouncer_weights_limit_file)?,
235-
versioned_constants,
236228
aggregator_batch_weights_limit: AggregatorBatchWeights::from(&bouncer_weights_limit),
229+
bouncer_weights_limit,
237230
};
238231
let rpc_client = JsonRpcClient::new(HttpTransport::new(params.madara_rpc_url.clone()));
239232
let feeder_gateway_client = RestClient::new(params.madara_feeder_gateway_url.clone());

orchestrator/src/tests/config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ pub(crate) fn get_env_params(test_id: Option<&str>) -> EnvParams {
734734
"MADARA_ORCHESTRATOR_ETH_NATIVE_FEE_TOKEN_ADDRESS",
735735
DEFAULT_SEPOLIA_ETH_FEE_TOKEN,
736736
),
737-
versioned_constants: versioned_constants.clone(),
737+
versioned_constants,
738738
};
739739

740740
let max_num_blobs = get_env_var_or_default("MADARA_ORCHESTRATOR_MAX_NUM_BLOBS", "6").parse::<usize>().unwrap();
@@ -819,7 +819,6 @@ pub(crate) fn get_env_params(test_id: Option<&str>) -> EnvParams {
819819
.parse::<bool>()
820820
.unwrap_or(false),
821821
bouncer_weights_limit: Default::default(), // Use default bouncer weights for tests
822-
versioned_constants,
823822
aggregator_batch_weights_limit: AggregatorBatchWeights::from(&BouncerWeights::default()),
824823
};
825824

orchestrator/src/worker/event_handler/jobs/snos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl JobHandlerTrait for SnosJobHandler {
111111
debug!("Calling generate_pie function");
112112

113113
// Use pre-loaded versioned constants from config (loaded at startup)
114-
let versioned_constants = config.params.versioned_constants.clone();
114+
let versioned_constants = config.snos_config().versioned_constants.clone();
115115

116116
let input = PieGenerationInput {
117117
rpc_url: snos_url.to_string(),

0 commit comments

Comments
 (0)