Skip to content

Commit eef2a43

Browse files
Itay-Tsabary-StarkwareItay-Tsabary-Starkware
authored
chore(apollo_deployments): remove consts from instance config overrides (#6362)
1 parent a99ea43 commit eef2a43

File tree

5 files changed

+71
-57
lines changed

5 files changed

+71
-57
lines changed

‎crates/apollo_deployments/src/deployment.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -234,24 +234,24 @@ impl DeploymentConfigOverride {
234234
#[derive(Debug, Serialize)]
235235
pub struct InstanceConfigOverride {
236236
#[serde(rename = "consensus_manager_config.network_config.bootstrap_peer_multiaddr")]
237-
consensus_bootstrap_peer_multiaddr: &'static str,
237+
consensus_bootstrap_peer_multiaddr: String,
238238
#[serde(rename = "consensus_manager_config.network_config.bootstrap_peer_multiaddr.#is_none")]
239239
consensus_bootstrap_peer_multiaddr_is_none: bool,
240240
// TODO(Tsabary): network secret keys should be defined as secrets.
241241
#[serde(rename = "consensus_manager_config.network_config.secret_key")]
242-
consensus_secret_key: &'static str,
242+
consensus_secret_key: String,
243243
#[serde(rename = "mempool_p2p_config.network_config.bootstrap_peer_multiaddr")]
244-
mempool_bootstrap_peer_multiaddr: &'static str,
244+
mempool_bootstrap_peer_multiaddr: String,
245245
#[serde(rename = "mempool_p2p_config.network_config.bootstrap_peer_multiaddr.#is_none")]
246246
mempool_bootstrap_peer_multiaddr_is_none: bool,
247247
// TODO(Tsabary): network secret keys should be defined as secrets.
248248
#[serde(rename = "mempool_p2p_config.network_config.secret_key")]
249-
mempool_secret_key: &'static str,
250-
validator_id: &'static str,
249+
mempool_secret_key: String,
250+
validator_id: String,
251251
}
252252

253253
impl InstanceConfigOverride {
254-
pub const fn new(
254+
pub fn new(
255255
consensus_bootstrap_peer_multiaddr: &'static str,
256256
consensus_bootstrap_peer_multiaddr_is_none: bool,
257257
consensus_secret_key: &'static str,
@@ -261,13 +261,13 @@ impl InstanceConfigOverride {
261261
validator_id: &'static str,
262262
) -> Self {
263263
Self {
264-
consensus_bootstrap_peer_multiaddr,
264+
consensus_bootstrap_peer_multiaddr: consensus_bootstrap_peer_multiaddr.to_string(),
265265
consensus_bootstrap_peer_multiaddr_is_none,
266-
consensus_secret_key,
267-
mempool_bootstrap_peer_multiaddr,
266+
consensus_secret_key: consensus_secret_key.to_string(),
267+
mempool_bootstrap_peer_multiaddr: mempool_bootstrap_peer_multiaddr.to_string(),
268268
mempool_bootstrap_peer_multiaddr_is_none,
269-
mempool_secret_key,
270-
validator_id,
269+
mempool_secret_key: mempool_secret_key.to_string(),
270+
validator_id: validator_id.to_string(),
271271
}
272272
}
273273
}

‎crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs

+16-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
2020
"0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
2121
);
2222

23-
const SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
23+
fn sepolia_integration_node_0_instance_config_override() -> InstanceConfigOverride {
2424
InstanceConfigOverride::new(
2525
"",
2626
true,
@@ -29,9 +29,10 @@ const SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
2929
true,
3030
"0x0101010101010101010101010101010101010101010101010101010101010101",
3131
"0x1",
32-
);
32+
)
33+
}
3334

34-
const SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
35+
fn sepolia_integration_node_1_instance_config_override() -> InstanceConfigOverride {
3536
InstanceConfigOverride::new(
3637
"/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
3738
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -42,9 +43,10 @@ const SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
4243
false,
4344
"0x0101010101010101010101010101010101010101010101010101010101010102",
4445
"0x2",
45-
);
46+
)
47+
}
4648

47-
const SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
49+
fn sepolia_integration_node_2_instance_config_override() -> InstanceConfigOverride {
4850
InstanceConfigOverride::new(
4951
"/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
5052
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -55,9 +57,10 @@ const SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
5557
false,
5658
"0x0101010101010101010101010101010101010101010101010101010101010103",
5759
"0x3",
58-
);
60+
)
61+
}
5962

60-
const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
63+
fn sepolia_integration_node_3_instance_config_override() -> InstanceConfigOverride {
6164
InstanceConfigOverride::new(
6265
"/dns/sequencer-core-service.apollo-sepolia-integration-0.svc.cluster.local/tcp/53080/p2p/\
6366
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -68,30 +71,31 @@ const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
6871
false,
6972
"0x0101010101010101010101010101010101010101010101010101010101010104",
7073
"0x4",
71-
);
74+
)
75+
}
7276

7377
fn sepolia_integration_node_0_config_override() -> ConfigOverride {
7478
ConfigOverride::new(
7579
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
76-
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
80+
sepolia_integration_node_0_instance_config_override(),
7781
)
7882
}
7983
fn sepolia_integration_node_1_config_override() -> ConfigOverride {
8084
ConfigOverride::new(
8185
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
82-
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
86+
sepolia_integration_node_1_instance_config_override(),
8387
)
8488
}
8589
fn sepolia_integration_node_2_config_override() -> ConfigOverride {
8690
ConfigOverride::new(
8791
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
88-
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
92+
sepolia_integration_node_2_instance_config_override(),
8993
)
9094
}
9195
fn sepolia_integration_node_3_config_override() -> ConfigOverride {
9296
ConfigOverride::new(
9397
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
94-
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
98+
sepolia_integration_node_3_instance_config_override(),
9599
)
96100
}
97101

‎crates/apollo_deployments/src/deployment_definitions/testing.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,20 @@ const TESTING_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride = DeploymentC
1919
"0x1002",
2020
);
2121

22-
const TESTING_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = InstanceConfigOverride::new(
23-
"",
24-
true,
25-
"0x0101010101010101010101010101010101010101010101010101010101010101",
26-
"",
27-
true,
28-
"0x0101010101010101010101010101010101010101010101010101010101010101",
29-
"0x64",
30-
);
22+
fn testing_instance_config_override() -> InstanceConfigOverride {
23+
InstanceConfigOverride::new(
24+
"",
25+
true,
26+
"0x0101010101010101010101010101010101010101010101010101010101010101",
27+
"",
28+
true,
29+
"0x0101010101010101010101010101010101010101010101010101010101010101",
30+
"0x64",
31+
)
32+
}
3133

3234
fn testing_config_override() -> ConfigOverride {
33-
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE)
35+
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, testing_instance_config_override())
3436
}
3537

3638
const TESTING_INGRESS_DOMAIN: &str = "sw-dev.io";

‎crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs

+16-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
2020
"0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
2121
);
2222

23-
const TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
23+
fn testing_env_2_node_0_instance_config_override() -> InstanceConfigOverride {
2424
InstanceConfigOverride::new(
2525
"",
2626
true,
@@ -29,9 +29,10 @@ const TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
2929
true,
3030
"0x0101010101010101010101010101010101010101010101010101010101010101",
3131
"0x1",
32-
);
32+
)
33+
}
3334

34-
const TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
35+
fn testing_env_2_node_1_instance_config_override() -> InstanceConfigOverride {
3536
InstanceConfigOverride::new(
3637
"/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
3738
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -42,9 +43,10 @@ const TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
4243
false,
4344
"0x0101010101010101010101010101010101010101010101010101010101010102",
4445
"0x2",
45-
);
46+
)
47+
}
4648

47-
const TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
49+
fn testing_env_2_node_2_instance_config_override() -> InstanceConfigOverride {
4850
InstanceConfigOverride::new(
4951
"/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
5052
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -55,9 +57,10 @@ const TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
5557
false,
5658
"0x0101010101010101010101010101010101010101010101010101010101010103",
5759
"0x3",
58-
);
60+
)
61+
}
5962

60-
const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
63+
fn testing_env_2_node_3_instance_config_override() -> InstanceConfigOverride {
6164
InstanceConfigOverride::new(
6265
"/dns/sequencer-core-service.sequencer-test-sepolia-0.svc.cluster.local/tcp/53080/p2p/\
6366
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -68,30 +71,31 @@ const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
6871
false,
6972
"0x0101010101010101010101010101010101010101010101010101010101010104",
7073
"0x4",
71-
);
74+
)
75+
}
7276

7377
fn testing_env_2_node_0_config_override() -> ConfigOverride {
7478
ConfigOverride::new(
7579
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
76-
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
80+
testing_env_2_node_0_instance_config_override(),
7781
)
7882
}
7983
fn testing_env_2_node_1_config_override() -> ConfigOverride {
8084
ConfigOverride::new(
8185
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
82-
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
86+
testing_env_2_node_1_instance_config_override(),
8387
)
8488
}
8589
fn testing_env_2_node_2_config_override() -> ConfigOverride {
8690
ConfigOverride::new(
8791
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
88-
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
92+
testing_env_2_node_2_instance_config_override(),
8993
)
9094
}
9195
fn testing_env_2_node_3_config_override() -> ConfigOverride {
9296
ConfigOverride::new(
9397
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
94-
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
98+
testing_env_2_node_3_instance_config_override(),
9599
)
96100
}
97101

‎crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs

+16-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE: DeploymentConfigOverride =
2020
"0x54a93d918d62b2fb62b25e77d9cb693bd277ab7e6fa236e53af263f1adb40e4",
2121
);
2222

23-
const TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
23+
fn testing_env_3_node_0_instance_config_override() -> InstanceConfigOverride {
2424
InstanceConfigOverride::new(
2525
"",
2626
true,
@@ -29,9 +29,10 @@ const TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
2929
true,
3030
"0x0101010101010101010101010101010101010101010101010101010101010101",
3131
"0x1",
32-
);
32+
)
33+
}
3334

34-
const TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
35+
fn testing_env_3_node_1_instance_config_override() -> InstanceConfigOverride {
3536
InstanceConfigOverride::new(
3637
"/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
3738
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -42,9 +43,10 @@ const TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
4243
false,
4344
"0x0101010101010101010101010101010101010101010101010101010101010102",
4445
"0x2",
45-
);
46+
)
47+
}
4648

47-
const TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
49+
fn testing_env_3_node_2_instance_config_override() -> InstanceConfigOverride {
4850
InstanceConfigOverride::new(
4951
"/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
5052
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -55,9 +57,10 @@ const TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
5557
false,
5658
"0x0101010101010101010101010101010101010101010101010101010101010103",
5759
"0x3",
58-
);
60+
)
61+
}
5962

60-
const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
63+
fn testing_env_3_node_3_instance_config_override() -> InstanceConfigOverride {
6164
InstanceConfigOverride::new(
6265
"/dns/sequencer-core-service.sequencer-test-3-node-0.svc.cluster.local/tcp/53080/p2p/\
6366
12D3KooWK99VoVxNE7XzyBwXEzW7xhK7Gpv85r9F3V3fyKSUKPH5",
@@ -68,30 +71,31 @@ const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
6871
false,
6972
"0x0101010101010101010101010101010101010101010101010101010101010104",
7073
"0x4",
71-
);
74+
)
75+
}
7276

7377
fn testing_env_3_node_0_config_override() -> ConfigOverride {
7478
ConfigOverride::new(
7579
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
76-
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
80+
testing_env_3_node_0_instance_config_override(),
7781
)
7882
}
7983
fn testing_env_3_node_1_config_override() -> ConfigOverride {
8084
ConfigOverride::new(
8185
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
82-
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
86+
testing_env_3_node_1_instance_config_override(),
8387
)
8488
}
8589
fn testing_env_3_node_2_config_override() -> ConfigOverride {
8690
ConfigOverride::new(
8791
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
88-
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
92+
testing_env_3_node_2_instance_config_override(),
8993
)
9094
}
9195
fn testing_env_3_node_3_config_override() -> ConfigOverride {
9296
ConfigOverride::new(
9397
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
94-
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
98+
testing_env_3_node_3_instance_config_override(),
9599
)
96100
}
97101

0 commit comments

Comments
 (0)