refactor(dispatcher): update dependencies

cartesi · Jul 31, 2023 · 389d59c · 389d59c
1 parent f868fee
commit 389d59c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 48 deletions.
diff --git a/offchain/Cargo.lock b/offchain/Cargo.lock
diff --git a/offchain/dispatcher/Cargo.toml b/offchain/dispatcher/Cargo.toml
@@ -13,6 +13,8 @@ contracts = { path = "../contracts" }
 http-server = { path = "../http-server" }
 rollups-events = { path = "../rollups-events" }
 types = { path = "../types" }
+state-fold = { path = "../state-fold" }
+state-fold-types = { path = "../state-fold-types", features = ["ethers"] }
 
 async-trait.workspace = true
 axum.workspace = true
@@ -28,11 +30,9 @@ rusoto_sts.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 snafu.workspace = true
-state-client-lib.workspace = true
-state-fold-types = { workspace = true, features = ["ethers"] }
 tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
 tokio-stream.workspace = true
-tonic = "0.8" # TODO: the state-fold still uses this version
+tonic.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tracing.workspace = true
 url.workspace = true

diff --git a/offchain/dispatcher/src/config.rs b/offchain/dispatcher/src/config.rs
@@ -8,7 +8,9 @@ use eth_tx_manager::{
 };
 use http_server::HttpServerConfig;
 use snafu::{ResultExt, Snafu};
-use state_client_lib::config::{Error as SCError, SCConfig, SCEnvCLIConfig};
+use state_fold::state_client_lib::config::{
+    Error as SCError, SCConfig, SCEnvCLIConfig,
+};
 use std::{fs::File, io::BufReader, path::PathBuf};
 
 use rollups_events::{BrokerCLIConfig, BrokerConfig};

diff --git a/offchain/dispatcher/src/dispatcher.rs b/offchain/dispatcher/src/dispatcher.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 (see LICENSE)
 
 use rollups_events::{Address, DAppMetadata};
-use state_client_lib::StateServer;
+use state_fold::state_client_lib::StateServer;
 use state_fold_types::{Block, BlockStreamItem};
 use tokio_stream::StreamExt;
 use tracing::{error, info, instrument, trace, warn};

diff --git a/offchain/dispatcher/src/error.rs b/offchain/dispatcher/src/error.rs
@@ -3,7 +3,7 @@
 
 use axum::http::uri::InvalidUri;
 use snafu::Snafu;
-use state_client_lib::error::StateServerError;
+use state_fold::state_client_lib::error::StateServerError;
 use std::net::AddrParseError;
 use tonic::transport::Error as TonicError;
 

diff --git a/offchain/dispatcher/src/setup.rs b/offchain/dispatcher/src/setup.rs
@@ -3,7 +3,7 @@
 
 use rollups_events::DAppMetadata;
 use snafu::ResultExt;
-use state_client_lib::{
+use state_fold::state_client_lib::{
     config::SCConfig, error::StateServerError, BlockServer,
     GrpcStateFoldClient, StateServer,
 };