refactor: ♻️ pass ci

change due to merge main
madara-alliance · Mar 5, 2024 · 1b46be8 · 1b46be8
1 parent 4e98d45
commit 1b46be8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -7,8 +7,7 @@ on:
     branches: [main]
 
 concurrency:
-  group:
-    pr-checks-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  group: pr-checks-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/rust-check.yml b/.github/workflows/rust-check.yml
@@ -17,8 +17,7 @@ jobs:
         with:
           path: |
             target/release/deoxys
-          key:
-            ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
+          key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
             github.run_id }}
           restore-keys: |
             ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}

diff --git a/crates/client/mapping-sync/Cargo.toml b/crates/client/mapping-sync/Cargo.toml
@@ -18,9 +18,9 @@ futures = { workspace = true, default-features = true }
 futures-timer = "3.0.2"
 log = { workspace = true, default-features = true }
 mc-db = { workspace = true }
-mc-sync = { workspace = true }
 mc-rpc-core = { workspace = true }
 mc-storage = { workspace = true }
+mc-sync = { workspace = true }
 mp-digest-log = { workspace = true }
 mp-felt = { workspace = true }
 mp-hashers = { workspace = true }

diff --git a/crates/client/rpc/Cargo.toml b/crates/client/rpc/Cargo.toml
@@ -23,9 +23,9 @@ pallet-starknet = { workspace = true, default-features = true }
 pallet-starknet-runtime-api = { workspace = true, default-features = true }
 # Madara client
 mc-db = { workspace = true }
-mc-sync = { workspace = true }
 mc-rpc-core = { workspace = true }
 mc-storage = { workspace = true }
+mc-sync = { workspace = true }
 # Substate primitives
 frame-support = { workspace = true }
 frame-system = { workspace = true }

diff --git a/crates/client/rpc/src/lib.rs b/crates/client/rpc/src/lib.rs
@@ -18,12 +18,12 @@ use errors::StarknetRpcApiError;
 use jsonrpsee::core::{async_trait, RpcResult};
 use jsonrpsee::types::error::CallError;
 use log::error;
-use mc_sync::l2::get_config;
-use mc_sync::utility::get_highest_block_hash_and_number;
 use mc_genesis_data_provider::GenesisProvider;
 pub use mc_rpc_core::utils::*;
 pub use mc_rpc_core::{Felt, StarknetReadRpcApiServer, StarknetTraceRpcApiServer, StarknetWriteRpcApiServer};
 use mc_storage::OverrideHandle;
+use mc_sync::l2::get_config;
+use mc_sync::utility::get_highest_block_hash_and_number;
 use mp_block::BlockStatus;
 use mp_contract::class::ContractClassWrapper;
 use mp_felt::{Felt252Wrapper, Felt252WrapperError};
@@ -53,11 +53,11 @@ use starknet_core::types::{
     BlockHashAndNumber, BlockId, BlockTag, BlockWithTxHashes, BlockWithTxs, BroadcastedDeclareTransaction,
     BroadcastedDeployAccountTransaction, BroadcastedInvokeTransaction, BroadcastedTransaction, ContractClass,
     DeclareTransactionReceipt, DeclareTransactionResult, DeployAccountTransactionReceipt,
-    DeployAccountTransactionResult, DeployTransactionReceipt, EventFilterWithPage, EventsPage,
-    ExecutionResources, ExecutionResult, FeeEstimate, FieldElement, FunctionCall, Hash256, InvokeTransactionReceipt,
+    DeployAccountTransactionResult, DeployTransactionReceipt, EventFilterWithPage, EventsPage, ExecutionResources,
+    ExecutionResult, FeeEstimate, FieldElement, FunctionCall, Hash256, InvokeTransactionReceipt,
     InvokeTransactionResult, L1HandlerTransactionReceipt, MaybePendingBlockWithTxHashes, MaybePendingBlockWithTxs,
-    MaybePendingTransactionReceipt, MsgFromL1, StateDiff, StateUpdate, SyncStatus, SyncStatusType,
-    Transaction, TransactionExecutionStatus, TransactionFinalityStatus, TransactionReceipt,
+    MaybePendingTransactionReceipt, MsgFromL1, StateDiff, StateUpdate, SyncStatus, SyncStatusType, Transaction,
+    TransactionExecutionStatus, TransactionFinalityStatus, TransactionReceipt,
 };
 use starknet_providers::{Provider, ProviderError, SequencerGatewayProvider};
 
@@ -885,9 +885,9 @@ where
         let block_status: BlockStatus = if starknet_block.header().block_number
             <= mc_sync::l1::ETHEREUM_STATE_UPDATE.lock().unwrap().block_number
         {
-            BlockStatus::AcceptedOnL1.into()
+            BlockStatus::AcceptedOnL1
         } else {
-            BlockStatus::AcceptedOnL2.into()
+            BlockStatus::AcceptedOnL2
         };
 
         let parent_blockhash = starknet_block.header().parent_block_hash;
@@ -1581,7 +1581,7 @@ where
 
         let actual_fee = execution_infos.actual_fee.0.into();
 
-        let actual_status = if block_number <= mc_deoxys::l1::ETHEREUM_STATE_UPDATE.lock().unwrap().block_number {
+        let actual_status = if block_number <= mc_sync::l1::ETHEREUM_STATE_UPDATE.lock().unwrap().block_number {
             TransactionFinalityStatus::AcceptedOnL1
         } else {
             TransactionFinalityStatus::AcceptedOnL2

diff --git a/crates/client/rpc/src/trace_api.rs b/crates/client/rpc/src/trace_api.rs
@@ -32,8 +32,8 @@ use starknet_ff::FieldElement;
 use thiserror::Error;
 
 use crate::errors::StarknetRpcApiError;
-use crate::Starknet;
 use crate::utils::blockifier_to_starknet_rs_ordered_events;
+use crate::Starknet;
 
 #[async_trait]
 #[allow(unused_variables)]