Skip to content

Commit afaff92

Browse files
authored
fix: Refactor TeeSessionEnvironmentVariable enum fields to PascalCase (#12)
1 parent 83715ec commit afaff92

File tree

4 files changed

+31
-40
lines changed

4 files changed

+31
-40
lines changed

src/api/worker_api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl WorkerApiClient {
8383
/// ```
8484
pub fn from_env() -> Self {
8585
let worker_host = get_env_var_or_error(
86-
TeeSessionEnvironmentVariable::WORKER_HOST_ENV_VAR,
86+
TeeSessionEnvironmentVariable::WorkerHostEnvVar,
8787
ReplicateStatusCause::PostComputeWorkerAddressMissing,
8888
)
8989
.unwrap_or_else(|_| DEFAULT_WORKER_HOST.to_string());
@@ -195,7 +195,7 @@ mod tests {
195195
#[test]
196196
fn should_get_worker_api_client_with_env_var() {
197197
with_vars(
198-
vec![(WORKER_HOST_ENV_VAR.name(), Some("custom-worker-host:9999"))],
198+
vec![(WorkerHostEnvVar.name(), Some("custom-worker-host:9999"))],
199199
|| {
200200
let client = WorkerApiClient::from_env();
201201
assert_eq!(client.base_url, "http://custom-worker-host:9999");
@@ -205,7 +205,7 @@ mod tests {
205205

206206
#[test]
207207
fn should_get_worker_api_client_without_env_var() {
208-
with_vars(vec![(WORKER_HOST_ENV_VAR.name(), None::<&str>)], || {
208+
with_vars(vec![(WorkerHostEnvVar.name(), None::<&str>)], || {
209209
let client = WorkerApiClient::from_env();
210210
assert_eq!(client.base_url, format!("http://{}", DEFAULT_WORKER_HOST));
211211
});

src/compute/app_runner.rs

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl DefaultPostComputeRunner {
4545
impl PostComputeRunnerInterface for DefaultPostComputeRunner {
4646
fn run_post_compute(&self, chain_task_id: &str) -> Result<(), Box<dyn Error>> {
4747
let should_callback: bool = match get_env_var_or_error(
48-
TeeSessionEnvironmentVariable::RESULT_STORAGE_CALLBACK,
48+
TeeSessionEnvironmentVariable::ResultStorageCallback,
4949
ReplicateStatusCause::PostComputeFailedUnknownIssue, //TODO: Update this error cause to a more specific one
5050
) {
5151
Ok(value) => match value.parse::<bool>() {
@@ -120,7 +120,7 @@ impl PostComputeRunnerInterface for DefaultPostComputeRunner {
120120
pub fn start_with_runner<R: PostComputeRunnerInterface>(runner: &R) -> i32 {
121121
println!("Tee worker post-compute started");
122122
let chain_task_id: String = match get_env_var_or_error(
123-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID,
123+
TeeSessionEnvironmentVariable::IexecTaskId,
124124
ReplicateStatusCause::PostComputeTaskIdMissing,
125125
) {
126126
Ok(id) => id,
@@ -132,7 +132,6 @@ pub fn start_with_runner<R: PostComputeRunnerInterface>(runner: &R) -> i32 {
132132
return 3; // Exit code for missing taskID context
133133
}
134134
};
135-
136135
match runner.run_post_compute(&chain_task_id) {
137136
Ok(()) => {
138137
info!("TEE post-compute completed");
@@ -201,11 +200,6 @@ pub fn start() -> i32 {
201200
start_with_runner(&runner)
202201
}
203202

204-
pub fn run_post_compute(chain_task_id: &str) -> Result<(), Box<dyn Error>> {
205-
let runner = DefaultPostComputeRunner::new();
206-
runner.run_post_compute(chain_task_id)
207-
}
208-
209203
#[cfg(test)]
210204
mod tests {
211205
use super::*;
@@ -282,7 +276,7 @@ mod tests {
282276
fn start_return_valid_exit_code_when_ran() {
283277
with_vars(
284278
vec![(
285-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
279+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
286280
Some("0x123"),
287281
)],
288282
|| {
@@ -299,7 +293,7 @@ mod tests {
299293
fn start_return_3_when_task_id_missing() {
300294
with_vars(
301295
vec![(
302-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
296+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
303297
None::<&str>,
304298
)],
305299
|| {
@@ -313,10 +307,7 @@ mod tests {
313307
#[test]
314308
fn start_return_3_when_empty_task_id() {
315309
with_vars(
316-
vec![(
317-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
318-
Some(""),
319-
)],
310+
vec![(TeeSessionEnvironmentVariable::IexecTaskId.name(), Some(""))],
320311
|| {
321312
let runner = MockRunner::new();
322313
let result = start_with_runner(&runner);
@@ -329,7 +320,7 @@ mod tests {
329320
fn start_return_0_when_successful() {
330321
with_vars(
331322
vec![(
332-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
323+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
333324
Some("0x0"),
334325
)],
335326
|| {
@@ -344,7 +335,7 @@ mod tests {
344335
fn start_return_1_when_fail_with_known_cause() {
345336
with_vars(
346337
vec![(
347-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
338+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
348339
Some("0x0"),
349340
)],
350341
|| {
@@ -365,7 +356,7 @@ mod tests {
365356
fn start_return_1_when_fail_with_unknown_cause() {
366357
with_vars(
367358
vec![(
368-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
359+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
369360
Some("0x0"),
370361
)],
371362
|| {
@@ -384,7 +375,7 @@ mod tests {
384375
fn start_return_2_when_exit_cause_not_transmitted() {
385376
with_vars(
386377
vec![(
387-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
378+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
388379
Some("0x0"),
389380
)],
390381
|| {
@@ -404,7 +395,7 @@ mod tests {
404395
fn start_return_2_when_get_challenge_fails() {
405396
with_vars(
406397
vec![(
407-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID.name(),
398+
TeeSessionEnvironmentVariable::IexecTaskId.name(),
408399
Some("0x0"),
409400
)],
410401
|| {

src/compute/signer.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ pub fn sign_enclave_challenge(
9999
/// ```
100100
pub fn get_challenge(chain_task_id: &str) -> Result<String, ReplicateStatusCause> {
101101
let worker_address: String = get_env_var_or_error(
102-
TeeSessionEnvironmentVariable::SIGN_WORKER_ADDRESS,
102+
TeeSessionEnvironmentVariable::SignWorkerAddress,
103103
ReplicateStatusCause::PostComputeWorkerAddressMissing,
104104
)?;
105105
let tee_challenge_private_key: String = get_env_var_or_error(
106-
TeeSessionEnvironmentVariable::SIGN_TEE_CHALLENGE_PRIVATE_KEY,
106+
TeeSessionEnvironmentVariable::SignTeeChallengePrivateKey,
107107
ReplicateStatusCause::PostComputeTeeChallengePrivateKeyMissing,
108108
)?;
109109
let message_hash: String = concatenate_and_hash(&[chain_task_id, &worker_address]);
@@ -151,11 +151,11 @@ mod tests {
151151
with_vars(
152152
vec![
153153
(
154-
TeeSessionEnvironmentVariable::SIGN_WORKER_ADDRESS.name(),
154+
TeeSessionEnvironmentVariable::SignWorkerAddress.name(),
155155
Some(WORKER_ADDRESS),
156156
),
157157
(
158-
TeeSessionEnvironmentVariable::SIGN_TEE_CHALLENGE_PRIVATE_KEY.name(),
158+
TeeSessionEnvironmentVariable::SignTeeChallengePrivateKey.name(),
159159
Some(ENCLAVE_CHALLENGE_PRIVATE_KEY),
160160
),
161161
],
@@ -184,11 +184,11 @@ mod tests {
184184
with_vars(
185185
vec![
186186
(
187-
TeeSessionEnvironmentVariable::SIGN_WORKER_ADDRESS.name(),
187+
TeeSessionEnvironmentVariable::SignWorkerAddress.name(),
188188
None,
189189
),
190190
(
191-
TeeSessionEnvironmentVariable::SIGN_TEE_CHALLENGE_PRIVATE_KEY.name(),
191+
TeeSessionEnvironmentVariable::SignTeeChallengePrivateKey.name(),
192192
Some(ENCLAVE_CHALLENGE_PRIVATE_KEY),
193193
),
194194
],
@@ -210,11 +210,11 @@ mod tests {
210210
with_vars(
211211
vec![
212212
(
213-
TeeSessionEnvironmentVariable::SIGN_WORKER_ADDRESS.name(),
213+
TeeSessionEnvironmentVariable::SignWorkerAddress.name(),
214214
Some(WORKER_ADDRESS),
215215
),
216216
(
217-
TeeSessionEnvironmentVariable::SIGN_TEE_CHALLENGE_PRIVATE_KEY.name(),
217+
TeeSessionEnvironmentVariable::SignTeeChallengePrivateKey.name(),
218218
None,
219219
),
220220
],

src/compute/utils/env_utils.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ use crate::compute::errors::ReplicateStatusCause;
22
use std::env;
33

44
pub enum TeeSessionEnvironmentVariable {
5-
IEXEC_TASK_ID,
6-
RESULT_STORAGE_CALLBACK,
7-
SIGN_TEE_CHALLENGE_PRIVATE_KEY,
8-
SIGN_WORKER_ADDRESS,
9-
WORKER_HOST_ENV_VAR,
5+
IexecTaskId,
6+
ResultStorageCallback,
7+
SignTeeChallengePrivateKey,
8+
SignWorkerAddress,
9+
WorkerHostEnvVar,
1010
}
1111

1212
impl TeeSessionEnvironmentVariable {
1313
pub fn name(&self) -> &str {
1414
match self {
15-
TeeSessionEnvironmentVariable::IEXEC_TASK_ID => "IEXEC_TASK_ID",
16-
TeeSessionEnvironmentVariable::RESULT_STORAGE_CALLBACK => "RESULT_STORAGE_CALLBACK",
17-
TeeSessionEnvironmentVariable::SIGN_TEE_CHALLENGE_PRIVATE_KEY => {
15+
TeeSessionEnvironmentVariable::IexecTaskId => "IEXEC_TASK_ID",
16+
TeeSessionEnvironmentVariable::ResultStorageCallback => "RESULT_STORAGE_CALLBACK",
17+
TeeSessionEnvironmentVariable::SignTeeChallengePrivateKey => {
1818
"SIGN_TEE_CHALLENGE_PRIVATE_KEY"
1919
}
20-
TeeSessionEnvironmentVariable::SIGN_WORKER_ADDRESS => "SIGN_WORKER_ADDRESS",
21-
TeeSessionEnvironmentVariable::WORKER_HOST_ENV_VAR => "WORKER_HOST",
20+
TeeSessionEnvironmentVariable::SignWorkerAddress => "SIGN_WORKER_ADDRESS",
21+
TeeSessionEnvironmentVariable::WorkerHostEnvVar => "WORKER_HOST",
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)