Rename testing to test-exports and clear when both used for no reasons

Cargo.toml

@@ -52,8 +52,8 @@ opt-level = 3 # Speed-up the CI
 
 # # Features
 #
-# * testing: enable some tests specific exports.
-# Usage: add testing = ["massa_crate/testing", ...] to dev-dependencies to use test specific functions avaible in massa-crate.
+# * test-exports: enable some tests specific exports.
+# Usage: add test-exports = ["massa_crate/test-exports", ...] to dev-dependencies to use test specific functions avaible in massa-crate.
 # Do not add as a regular dependency. Never.
 #
 # * sandbox: for testing purpose, genesis timestamps is set as now + 9 seconds.

massa-api-exports/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [features]
 sandbox = []
-testing = []
+test-exports = []
 
 [dependencies]
 paginate = {workspace = true}

massa-api/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.26.1"
 edition = "2021"
 
 [features]
-testing = []
+test-exports = []
 
 [dependencies]
 jsonrpsee = { workspace = true, "features" = ["server", "macros"] }
@@ -37,7 +37,7 @@ massa_wallet = { workspace = true }
 
 
 [dev-dependencies]
-massa_consensus_exports = { workspace = true, "features" = ["testing"] }
+massa_consensus_exports = { workspace = true, "features" = ["test-exports"] }
 tempfile = { workspace = true }
 num = { workspace = true }
 massa_final_state = { workspace = true }

massa-async-pool/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Massa Labs <info@massa.net>"]
 edition = "2021"
 
 [features]
-testing = []
+test-exports = []
 sandbox = []
 
 [dependencies]

massa-async-pool/src/lib.rs

@@ -82,7 +82,7 @@
 //!
 //! ## Test exports
 //!
-//! When the crate feature `testing` is enabled, tooling useful for testing purposes is exported.
+//! When the crate feature `test-exports` is enabled, tooling useful for test-exports purposes is exported.
 //! See `test_exports/mod.rs` for details.
 
 mod changes;
@@ -103,5 +103,5 @@ pub use pool::{AsyncPool, AsyncPoolDeserializer, AsyncPoolSerializer};
 #[cfg(test)]
 mod tests;
 
-#[cfg(feature = "testing")]
+#[cfg(feature = "test-exports")]
 pub mod test_exports;

massa-bootstrap/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Massa Labs <info@massa.net>"]
 edition = "2021"
 
 [features]
-testing = ["massa_final_state/testing", "massa_ledger_worker/testing", "massa_consensus_exports/testing", "massa_async_pool/testing"]
+test-exports = ["massa_final_state/test-exports", "massa_ledger_worker/test-exports", "massa_consensus_exports/test-exports", "massa_async_pool/test-exports"]
 sandbox = ["massa_async_pool/sandbox", "massa_final_state/sandbox", "massa_models/sandbox"]
 
 [dependencies]
@@ -46,12 +46,12 @@ lazy_static = {workspace = true}   # BOM UPGRADE     Revert to "1.4" if problem
 tempfile = {workspace = true}   # BOM UPGRADE     Revert to "3.3" if problem
 serial_test = {workspace = true}   # BOM UPGRADE     Revert to "2.0.0" if problem
 num = {workspace = true}
-massa_final_state = {workspace = true, "features" = ["testing"]}
-massa_async_pool = {workspace = true, "features" = ["testing"]}
+massa_final_state = {workspace = true, "features" = ["test-exports"]}
+massa_async_pool = {workspace = true, "features" = ["test-exports"]}
 massa_ledger_exports = {workspace = true}
-massa_ledger_worker = {workspace = true, "features" = ["testing"]}
+massa_ledger_worker = {workspace = true, "features" = ["test-exports"]}
 massa_executed_ops = {workspace = true}
-massa_pos_worker = {workspace = true, "features" = ["testing"]}
-massa_pos_exports = {workspace = true, "features" = ["testing"]}
-massa_consensus_exports = {workspace = true, "features" = ["testing"]}
+massa_pos_worker = {workspace = true, "features" = ["test-exports"]}
+massa_pos_exports = {workspace = true, "features" = ["test-exports"]}
+massa_consensus_exports = {workspace = true, "features" = ["test-exports"]}
 massa_db_worker = {workspace = true}

massa-consensus-exports/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Massa Labs <info@massa.net>"]
 edition = "2021"
 
 [features]
-testing = ["massa_models/testing", "massa_execution_exports/testing", "massa_pool_exports/testing", "massa_pos_exports/testing", "massa_protocol_exports/testing", "massa_storage/testing", "dep:mockall"]
+test-exports = ["massa_models/test-exports", "massa_execution_exports/test-exports", "massa_pool_exports/test-exports", "massa_pos_exports/test-exports", "massa_protocol_exports/test-exports", "massa_storage/test-exports", "dep:mockall"]
 
 [dependencies]
 displaydoc = {workspace = true}

massa-consensus-exports/src/controller_trait.rs

@@ -9,7 +9,7 @@ use massa_models::{
 use massa_storage::Storage;
 
 /// Interface that communicates with the graph worker thread
-#[cfg_attr(any(test, feature = "testing"), mockall::automock)]
+#[cfg_attr(feature = "test-exports", mockall::automock)]
 pub trait ConsensusController: Send + Sync {
     /// Get an export of a part of the graph
     ///

massa-consensus-exports/src/lib.rs

@@ -16,10 +16,10 @@ pub use channels::{ConsensusBroadcasts, ConsensusChannels};
 pub use controller_trait::{ConsensusController, ConsensusManager};
 pub use settings::ConsensusConfig;
 
-#[cfg(feature = "testing")]
+#[cfg(feature = "test-exports")]
 pub use controller_trait::MockConsensusController;
 
 /// Test utils
-#[cfg(feature = "testing")]
+#[cfg(feature = "test-exports")]
 /// Exports related to tests as Mocks and configurations
 pub mod test_exports;

massa-consensus-worker/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 [features]
 sandbox = []
 bootstrap_server = []
-testing = ["tokio", "crossbeam-channel", "massa_execution_exports/testing", "massa_protocol_exports/testing", "massa_consensus_exports/testing", "massa_pos_exports/testing", "massa_pool_exports/testing"]
+test-exports = ["tokio", "crossbeam-channel", "massa_execution_exports/test-exports", "massa_protocol_exports/test-exports", "massa_consensus_exports/test-exports", "massa_pos_exports/test-exports", "massa_pool_exports/test-exports"]
 
 [dependencies]
 num = {workspace = true, "features" = ["serde"]}   # BOM UPGRADE     Revert to {"version": "0.4", "features": ["serde"]} if problem
@@ -32,9 +32,9 @@ tokio = {workspace = true, "optional" = true}   # BOM UPGRADE     Revert to {"ve
 crossbeam-channel = {workspace = true, "optional" = true}   # BOM UPGRADE     Revert to {"version": "0.5.6", "optional": true} if problem
 
 [dev-dependencies]
-massa_pool_exports = {workspace = true, features = ["testing"]}
-massa_pos_exports = {workspace = true, features = ["testing"]}
-massa_protocol_exports = {workspace = true, features = ["testing"]}
+massa_pool_exports = {workspace = true, features = ["test-exports"]}
+massa_pos_exports = {workspace = true, features = ["test-exports"]}
+massa_protocol_exports = {workspace = true, features = ["test-exports"]}
 massa_test_framework = {workspace = true}
 mockall = {workspace = true}
 rand = {workspace = true}

massa-executed-ops/Cargo.toml

@@ -17,4 +17,4 @@ massa_hash = {workspace = true}
 parking_lot = {workspace = true}
 
 [features]
-testing = ["massa_models/testing"]
+test-exports = ["massa_models/test-exports"]

massa-execution-exports/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [features]
 gas_calibration = ["tempfile"]
-testing = ["massa_models/testing", "tempfile", "mockall"]
+test-exports = ["massa_models/test-exports", "tempfile", "mockall"]
 
 [dependencies]
 displaydoc = {workspace = true}

massa-execution-exports/src/controller_traits.rs

@@ -20,7 +20,7 @@ use massa_models::stats::ExecutionStats;
 use std::collections::BTreeMap;
 use std::collections::HashMap;
 
-#[cfg_attr(any(test, feature = "testing"), mockall::automock)]
+#[cfg_attr(feature = "test-exports", mockall::automock)]
 /// interface that communicates with the execution worker thread
 pub trait ExecutionController: Send + Sync {
     /// Updates blockclique status by signaling newly finalized blocks and the latest blockclique.

massa-execution-exports/src/lib.rs

@@ -39,7 +39,7 @@
 //!
 //! ## Test exports
 //!
-//! When the crate feature `testing` is enabled, tooling useful for testing purposes is exported.
+//! When the crate feature `test-exports` is enabled, tooling useful for test-exports purposes is exported.
 //! See `test_exports/mod.rs` for details.
 
 #![warn(missing_docs)]
@@ -54,7 +54,7 @@ mod settings;
 mod types;
 
 pub use channels::ExecutionChannels;
-#[cfg(any(test, feature = "testing"))]
+#[cfg(feature = "test-exports")]
 pub use controller_traits::MockExecutionController;
 pub use controller_traits::{ExecutionController, ExecutionManager};
 pub use error::{ExecutionError, ExecutionQueryError};
@@ -69,5 +69,5 @@ pub use types::{
     ReadOnlyExecutionRequest, ReadOnlyExecutionTarget, SlotExecutionOutput,
 };
 
-#[cfg(any(feature = "testing", feature = "gas_calibration"))]
+#[cfg(any(feature = "test-exports", feature = "gas_calibration"))]
 pub mod test_exports;

massa-execution-exports/src/test_exports/mod.rs

@@ -1,7 +1,7 @@
 // Copyright (c) 2022 MASSA LABS <info@massa.net>
 
 //! This module exposes useful tooling for testing.
-//! It is only compiled and exported by the crate if the "testing" feature is enabled.
+//! It is only compiled and exported by the crate if the "test-exports" feature is enabled.
 //!
 //!
 //! # Architecture

massa-execution-worker/Cargo.toml

@@ -13,25 +13,25 @@ sandbox = ["massa_async_pool/sandbox"]
 gas_calibration = [
     "massa-sc-runtime/gas_calibration",
     "massa_execution_exports/gas_calibration",
-    "massa_final_state/testing",
+    "massa_final_state/test-exports",
     "massa_pos_worker",
     "massa_ledger_worker",
     "massa_db_worker",
     "tempfile",
 ]
-testing = [
-    "massa_execution_exports/testing",
-    "massa_ledger_exports/testing",
-    "massa_pos_exports/testing",
-    "massa_final_state/testing",
+test-exports = [
+    "massa_execution_exports/test-exports",
+    "massa_ledger_exports/test-exports",
+    "massa_pos_exports/test-exports",
+    "massa_final_state/test-exports",
     "massa-sc-runtime/testing",
-    "massa_wallet/testing",
+    "massa_wallet/test-exports",
     "tempfile",
     "massa_pos_worker",
     "massa_ledger_worker",
-    "massa_metrics/testing",
+    "massa_metrics/test-exports",
     "massa_db_worker",
-    "massa_metrics/testing",
+    "massa_metrics/test-exports",
 ]
 benchmarking = [
     "massa-sc-runtime/gas_calibration",
@@ -85,14 +85,14 @@ massa-proto-rs = { workspace = true }
 
 [dev-dependencies]
 massa_storage = { workspace = true }
-massa_execution_exports = { workspace = true, features = ["testing"] }
-massa_final_state = { workspace = true, features = ["testing"] }
-massa_ledger_exports = { workspace = true, features = ["testing"] }
-massa_pos_exports = { workspace = true, features = ["testing"] }
+massa_execution_exports = { workspace = true, features = ["test-exports"] }
+massa_final_state = { workspace = true, features = ["test-exports"] }
+massa_ledger_exports = { workspace = true, features = ["test-exports"] }
+massa_pos_exports = { workspace = true, features = ["test-exports"] }
 massa_pos_worker = { workspace = true }
 massa-sc-runtime = { workspace = true, features = ["testing"] }
-massa_wallet = { workspace = true, features = ["testing"] }
-massa_metrics = { workspace = true, features = ["testing"] }
+massa_wallet = { workspace = true, features = ["test-exports"] }
+massa_metrics = { workspace = true, features = ["test-exports"] }
 massa_db_worker = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
 massa_ledger_worker = { workspace = true }

massa-execution-worker/src/context.rs

@@ -101,14 +101,14 @@ pub struct ExecutionContext {
     #[cfg(all(
         not(feature = "gas_calibration"),
         not(feature = "benchmarking"),
-        not(feature = "testing"),
+        not(feature = "test-exports"),
         not(test)
     ))]
     speculative_ledger: SpeculativeLedger,
     #[cfg(any(
         feature = "gas_calibration",
         feature = "benchmarking",
-        feature = "testing",
+        feature = "test-exports",
         test
     ))]
     pub(crate) speculative_ledger: SpeculativeLedger,

massa-execution-worker/src/interface_impl.rs

@@ -30,7 +30,7 @@ use massa_time::MassaTime;
 #[cfg(any(
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing",
+    feature = "test-exports",
     test
 ))]
 use num::rational::Ratio;
@@ -46,7 +46,7 @@ use tracing::debug;
 #[cfg(any(
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing",
+    feature = "test-exports",
     test
 ))]
 use massa_models::datastore::Datastore;
@@ -80,7 +80,7 @@ impl InterfaceImpl {
     #[cfg(any(
         feature = "gas_calibration",
         feature = "benchmarking",
-        feature = "testing",
+        feature = "test-exports",
         test
     ))]
     /// Used to create an default interface to run SC in a test environment

massa-execution-worker/src/lib.rs

@@ -100,7 +100,7 @@ pub use worker::start_execution_worker;
 #[cfg(any(
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing"
+    feature = "test-exports"
 ))]
 pub use interface_impl::InterfaceImpl;
 
@@ -111,6 +111,6 @@ use criterion as _;
     test,
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing"
+    feature = "test-exports"
 ))]
 mod tests;

massa-execution-worker/src/speculative_ledger.rs

@@ -37,14 +37,14 @@ pub(crate) struct SpeculativeLedger {
     #[cfg(all(
         not(feature = "gas_calibration"),
         not(feature = "benchmarking"),
-        not(feature = "testing"),
+        not(feature = "test-exports"),
         not(test)
     ))]
     added_changes: LedgerChanges,
     #[cfg(any(
         feature = "gas_calibration",
         feature = "benchmarking",
-        feature = "testing",
+        feature = "test-exports",
         test
     ))]
     pub added_changes: LedgerChanges,

massa-execution-worker/src/tests/mod.rs

@@ -4,7 +4,8 @@
     test,
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing"
+    feature = "test-exports",
+    test
 ))]
 mod mock;
 
@@ -19,7 +20,7 @@ mod interface;
 #[cfg(any(
     feature = "gas_calibration",
     feature = "benchmarking",
-    feature = "testing",
+    feature = "test-exports",
     test
 ))]
 pub use mock::get_sample_state;

massa-factory-exports/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Massa Labs <info@massa.net>"]
 edition = "2021"
 
 [features]
-testing = ["massa_models/testing", "massa_protocol_exports/testing", "massa_pool_exports/testing"]
+test-exports = ["massa_models/test-exports", "massa_protocol_exports/test-exports", "massa_pool_exports/test-exports"]
 sandbox = []
 
 [dependencies]

massa-factory-exports/src/lib.rs

@@ -17,5 +17,5 @@ pub use error::*;
 pub use types::*;
 
 /// Tests utils
-#[cfg(feature = "testing")]
+#[cfg(feature = "test-exports")]
 pub mod test_exports;

massa-factory-worker/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [features]
 sandbox = []
-testing = ["massa_factory_exports/testing", "massa_pos_exports/testing", "massa_pool_exports/testing", "massa_protocol_exports/testing", "massa_wallet/testing"]
+test-exports = ["massa_factory_exports/test-exports", "massa_pos_exports/test-exports", "massa_pool_exports/test-exports", "massa_protocol_exports/test-exports", "massa_wallet/test-exports"]
 
 [dependencies]
 parking_lot = {workspace = true, "features" = ["deadlock_detection"]}
@@ -26,10 +26,10 @@ massa_versioning = {workspace = true}
 [dev-dependencies]
 num = {workspace = true}
 massa_hash = {workspace = true}
-massa_protocol_exports = {workspace = true, "features" = ["testing"]}
-massa_consensus_exports = {workspace = true, "features" = ["testing"]}
-massa_factory_exports = {workspace = true, "features" = ["testing"]}
-massa_wallet = {workspace = true, "features" = ["testing"]}
-massa_pos_exports = {workspace = true, "features" = ["testing"]}
-massa_pool_exports = {workspace = true, "features" = ["testing"]}
+massa_protocol_exports = {workspace = true, "features" = ["test-exports"]}
+massa_consensus_exports = {workspace = true, "features" = ["test-exports"]}
+massa_factory_exports = {workspace = true, "features" = ["test-exports"]}
+massa_wallet = {workspace = true, "features" = ["test-exports"]}
+massa_pos_exports = {workspace = true, "features" = ["test-exports"]}
+massa_pool_exports = {workspace = true, "features" = ["test-exports"]}
 serial_test = { workspace = true }