From 1c65d1798763c012b9ba60625d5f74d1f120bd34 Mon Sep 17 00:00:00 2001 From: Steve Nguyen Date: Mon, 9 Sep 2024 10:44:57 +0000 Subject: [PATCH] Chore: reformat code --- crates/orchestrator/src/alerts/aws_sns/mod.rs | 2 ++ crates/orchestrator/src/queue/job_queue.rs | 3 +-- crates/orchestrator/src/tests/data_storage/mod.rs | 4 ++++ crates/settlement-clients/aptos/Cargo.toml | 2 ++ crates/settlement-clients/ethereum/src/lib.rs | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/orchestrator/src/alerts/aws_sns/mod.rs b/crates/orchestrator/src/alerts/aws_sns/mod.rs index c78845ba..4f978578 100644 --- a/crates/orchestrator/src/alerts/aws_sns/mod.rs +++ b/crates/orchestrator/src/alerts/aws_sns/mod.rs @@ -12,6 +12,8 @@ use crate::config::ProviderConfig; pub const AWS_SNS_SETTINGS_NAME: &str = "sns"; +use crate::alerts::Alerts; + pub struct AWSSNS { client: Client, topic_arn: String, diff --git a/crates/orchestrator/src/queue/job_queue.rs b/crates/orchestrator/src/queue/job_queue.rs index 66b48b09..48e4b244 100644 --- a/crates/orchestrator/src/queue/job_queue.rs +++ b/crates/orchestrator/src/queue/job_queue.rs @@ -307,8 +307,7 @@ async fn get_delivery_from_queue(queue: &str, config: Arc) -> Result { - let config_clone = $config.clone(); + ($queue_type :expr, $handler : expr, $consume_function: expr) => { tokio::spawn(async move { loop { match $consume_function($queue_type, $handler, config_clone.clone()).await { diff --git a/crates/orchestrator/src/tests/data_storage/mod.rs b/crates/orchestrator/src/tests/data_storage/mod.rs index 235e57bc..54837b6a 100644 --- a/crates/orchestrator/src/tests/data_storage/mod.rs +++ b/crates/orchestrator/src/tests/data_storage/mod.rs @@ -8,6 +8,10 @@ use crate::data_storage::aws_s3::config::AWSS3Config; use crate::data_storage::aws_s3::AWSS3; use crate::data_storage::{DataStorage, DataStorageConfig}; +use crate::data_storage::aws_s3::config::AWSS3Config; +use crate::data_storage::aws_s3::AWSS3; +use crate::data_storage::{DataStorage, DataStorageConfig}; + /// This test checks the ability to put and get data from AWS S3 using `AWSS3`. /// It puts JSON data into a test bucket and retrieves it, verifying the data /// matches what was originally uploaded. diff --git a/crates/settlement-clients/aptos/Cargo.toml b/crates/settlement-clients/aptos/Cargo.toml index a9943689..df8342e8 100644 --- a/crates/settlement-clients/aptos/Cargo.toml +++ b/crates/settlement-clients/aptos/Cargo.toml @@ -12,6 +12,7 @@ aptos-testcontainer = { workspace = true } async-trait = { workspace = true } c-kzg = { workspace = true } color-eyre = { workspace = true } +c-kzg = { workspace = true } dotenvy = { workspace = true } hex = { workspace = true } lazy_static = { workspace = true } @@ -21,6 +22,7 @@ once_cell = { workspace = true } settlement-client-interface = { workspace = true } tokio = { workspace = true } utils = { workspace = true } +lazy_static = { workspace = true } [dev-dependencies] test-log = { workspace = true } diff --git a/crates/settlement-clients/ethereum/src/lib.rs b/crates/settlement-clients/ethereum/src/lib.rs index 1994c90c..32f115d4 100644 --- a/crates/settlement-clients/ethereum/src/lib.rs +++ b/crates/settlement-clients/ethereum/src/lib.rs @@ -28,6 +28,7 @@ use crate::clients::interfaces::validity_interface::StarknetValidityContractTrai use crate::clients::StarknetValidityContractClient; use crate::config::EthereumSettlementConfig; use crate::conversion::{slice_u8_to_u256, vec_u8_32_to_vec_u256}; + pub mod clients; pub mod config; pub mod conversion;