From 0330157008875fc63067800892e1acf1ae0200ba Mon Sep 17 00:00:00 2001 From: Steve Nguyen Date: Tue, 10 Sep 2024 11:02:08 +0000 Subject: [PATCH] Chore: merge aptos branch --- .github/workflows/coverage.yml | 1 + crates/orchestrator/src/config.rs | 4 ++++ crates/settlement-clients/aptos/Cargo.toml | 2 -- crates/settlement-clients/ethereum/src/lib.rs | 6 +++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ceef0c79..dbde3eda 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,3 +1,4 @@ +--- name: Rust Test & Coverage on: diff --git a/crates/orchestrator/src/config.rs b/crates/orchestrator/src/config.rs index c2eb431a..bab308db 100644 --- a/crates/orchestrator/src/config.rs +++ b/crates/orchestrator/src/config.rs @@ -222,6 +222,10 @@ pub async fn build_da_client(settings_provider: &impl Settings) -> Box { + let config = AptosDaConfig::new_from_env(); + Box::new(config.build_client().await) + } _ => panic!("Unsupported DA layer"), } } diff --git a/crates/settlement-clients/aptos/Cargo.toml b/crates/settlement-clients/aptos/Cargo.toml index df8342e8..a9943689 100644 --- a/crates/settlement-clients/aptos/Cargo.toml +++ b/crates/settlement-clients/aptos/Cargo.toml @@ -12,7 +12,6 @@ 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 } @@ -22,7 +21,6 @@ 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 32f115d4..abf6d680 100644 --- a/crates/settlement-clients/ethereum/src/lib.rs +++ b/crates/settlement-clients/ethereum/src/lib.rs @@ -134,7 +134,11 @@ impl EthereumSettlementClient { &KZG_SETTINGS, )?; - if !eval { Err(eyre!("ERROR : Assertion failed, not able to verify the proof.")) } else { Ok(kzg_proof) } + if !eval { + Err(eyre!("ERROR : Assertion failed, not able to verify the proof.")) + } else { + Ok(kzg_proof) + } } }