From 00c66b886df5ee70c6fce55feff83cc72b326747 Mon Sep 17 00:00:00 2001 From: Moncef AOUDIA Date: Tue, 17 Oct 2023 21:42:45 +0200 Subject: [PATCH] fix: rebasing issues --- Cargo.lock | 1 - massa-execution-exports/Cargo.toml | 5 ++--- massa-execution-exports/src/test_exports/mod.rs | 2 -- massa-grpc/Cargo.toml | 4 +--- massa-grpc/src/tests/stream.rs | 5 +++-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 422b1b8f2b3..63bc82c7094 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2837,7 +2837,6 @@ dependencies = [ "massa_versioning", "mockall", "num", - "parking_lot", "rand", "tempfile", "thiserror", diff --git a/massa-execution-exports/Cargo.toml b/massa-execution-exports/Cargo.toml index 52de6a2ae1f..f5822b02500 100644 --- a/massa-execution-exports/Cargo.toml +++ b/massa-execution-exports/Cargo.toml @@ -5,8 +5,8 @@ authors = ["Massa Labs "] edition = "2021" [features] -gas_calibration = ["massa_ledger_exports/testing", "parking_lot", "tempfile"] -testing = ["massa_models/testing", "massa_ledger_exports/testing", "parking_lot", "tempfile", "mockall", "rand"] +gas_calibration = ["tempfile"] +testing = ["massa_models/testing", "tempfile", "mockall", "rand"] [dependencies] displaydoc = {workspace = true} @@ -22,7 +22,6 @@ massa_time = {workspace = true} massa_storage = {workspace = true} massa_final_state = {workspace = true} massa_pos_exports = {workspace = true} -massa_ledger_exports = {workspace = true, optional = true} massa_module_cache = {workspace = true} massa_versioning = {workspace = true} massa-sc-runtime = {workspace = true} diff --git a/massa-execution-exports/src/test_exports/mod.rs b/massa-execution-exports/src/test_exports/mod.rs index 84c781a3c50..5a3a00db59e 100644 --- a/massa-execution-exports/src/test_exports/mod.rs +++ b/massa-execution-exports/src/test_exports/mod.rs @@ -14,9 +14,7 @@ //! with an execution worker within tests. mod config; -mod mock; mod tools; pub use config::*; -pub use mock::*; pub use tools::*; diff --git a/massa-grpc/Cargo.toml b/massa-grpc/Cargo.toml index 92d0d78971d..4b90afa24dd 100644 --- a/massa-grpc/Cargo.toml +++ b/massa-grpc/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://massa.net" documentation = "https://docs.massa.net/" [features] -testing = ["dep:mockall", "dep:num", "dep:massa_channel"] +testing = [] [dependencies] # Internal packages @@ -55,7 +55,5 @@ tracing = { workspace = true } massa_bootstrap = { workspace = true, "features" = ["testing"] } massa_consensus_exports = { workspace = true, "features" = ["testing"] } massa_final_state = { workspace = true } -mockall = { workspace = true } num = { workspace = true } tokio = { workspace = true, "features" = ["test-util", "time"] } -num = {workspace = true} diff --git a/massa-grpc/src/tests/stream.rs b/massa-grpc/src/tests/stream.rs index 6301a4f3bb2..55d6f14f8e6 100644 --- a/massa-grpc/src/tests/stream.rs +++ b/massa-grpc/src/tests/stream.rs @@ -1,12 +1,13 @@ // Copyright (c) 2023 MASSA LABS -use crate::tests::mock::{grpc_public_service, MockExecutionCtrl, MockPoolCtrl}; +use crate::tests::mock::grpc_public_service; use massa_bootstrap::test_exports::{ get_dummy_block_id, get_random_async_pool_changes, get_random_executed_de_changes, get_random_executed_ops_changes, get_random_execution_trail_hash_change, get_random_ledger_changes, }; -use massa_consensus_exports::test_exports::MockConsensusControllerImpl; +use massa_consensus_exports::MockConsensusController; +use massa_execution_exports::MockExecutionController; use massa_execution_exports::{ test_exports::get_random_eventstore, ExecutionOutput, SlotExecutionOutput, };