Rework consensus and graph

Cargo.toml

@@ -5,13 +5,12 @@ members = [
   "massa-bootstrap",
   "massa-client",
   "massa-cipher",
-  "massa-consensus-exports",
-  "massa-consensus-worker",
   "massa-execution-exports",
   "massa-execution-worker",
   "massa-factory-exports",
   "massa-factory-worker",
-  "massa-graph",
+  "massa-consensus-exports",
+  "massa-consensus-worker",
   "massa-hash",
   "massa-logging",
   "massa-models",

massa-api/Cargo.toml

@@ -18,7 +18,6 @@ itertools = "0.10"
 parking_lot = { version = "0.12", features = ["deadlock_detection"] }
 # custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }
-massa_graph = { path = "../massa-graph" }
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
 massa_network_exports = { path = "../massa-network-exports" }

massa-api/src/config.rs

@@ -1,6 +1,7 @@
 // Copyright (c) 2022 MASSA LABS <[email protected]>
 
 use jsonrpc_core::serde::Deserialize;
+use massa_time::MassaTime;
 use std::net::SocketAddr;
 
 /// API settings.
@@ -27,4 +28,12 @@ pub struct APIConfig {
     pub max_function_name_length: u16,
     /// max parameter size
     pub max_parameter_size: u32,
+    /// thread count
+    pub thread_count: u8,
+    /// `genesis_timestamp`
+    pub genesis_timestamp: MassaTime,
+    /// t0
+    pub t0: MassaTime,
+    /// periods per cycle
+    pub periods_per_cycle: u64,
 }

massa-api/src/error.rs

@@ -23,7 +23,7 @@ pub enum ApiError {
     /// `massa_hash` error: {0}
     MassaHashError(#[from] MassaHashError),
     /// consensus error: {0}
-    ConsensusError(#[from] Box<ConsensusError>),
+    ConsensusError(#[from] ConsensusError),
     /// execution error: {0}
     ExecutionError(#[from] ExecutionError),
     /// network error: {0}
@@ -57,9 +57,3 @@ impl From<ApiError> for jsonrpc_core::Error {
         }
     }
 }
-
-impl std::convert::From<ConsensusError> for ApiError {
-    fn from(err: ConsensusError) -> Self {
-        ApiError::ConsensusError(Box::new(err))
-    }
-}

massa-api/src/lib.rs

@@ -8,7 +8,7 @@ use error::ApiError;
 use jsonrpc_core::{BoxFuture, IoHandler, Value};
 use jsonrpc_derive::rpc;
 use jsonrpc_http_server::{CloseHandle, ServerBuilder};
-use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
+use massa_consensus_exports::ConsensusController;
 use massa_execution_exports::ExecutionController;
 use massa_models::api::{
     AddressInfo, BlockInfo, BlockSummary, DatastoreEntryInput, DatastoreEntryOutput,
@@ -53,7 +53,7 @@ pub use config::APIConfig;
 /// Public API component
 pub struct Public {
     /// link to the consensus component
-    pub consensus_command_sender: ConsensusCommandSender,
+    pub consensus_controller: Box<dyn ConsensusController>,
     /// link to the execution component
     pub execution_controller: Box<dyn ExecutionController>,
     /// link to the selector component
@@ -64,8 +64,6 @@ pub struct Public {
     pub protocol_command_sender: ProtocolCommandSender,
     /// Massa storage
     pub storage: Storage,
-    /// consensus configuration (TODO: remove it, can be retrieved via an endpoint)
-    pub consensus_config: ConsensusConfig,
     /// API settings
     pub api_settings: APIConfig,
     /// network setting
@@ -82,14 +80,10 @@ pub struct Public {
 
 /// Private API content
 pub struct Private {
-    /// link to the consensus component
-    pub consensus_command_sender: ConsensusCommandSender,
     /// link to the network component
     pub network_command_sender: NetworkCommandSender,
     /// link to the execution component
     pub execution_controller: Box<dyn ExecutionController>,
-    /// consensus configuration (TODO: remove it, can be retrieved via an endpoint)
-    pub consensus_config: ConsensusConfig,
     /// API settings
     pub api_settings: APIConfig,
     /// stop channel

massa-api/src/private.rs

@@ -7,7 +7,6 @@ use crate::{Endpoints, Private, RpcServer, StopHandle, API};
 use jsonrpc_core::BoxFuture;
 use jsonrpc_http_server::tokio::sync::mpsc;
 
-use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
 use massa_execution_exports::ExecutionController;
 use massa_models::api::{
     AddressInfo, BlockInfo, BlockSummary, DatastoreEntryInput, DatastoreEntryOutput,
@@ -38,20 +37,16 @@ use std::sync::Arc;
 impl API<Private> {
     /// generate a new private API
     pub fn new(
-        consensus_command_sender: ConsensusCommandSender,
         network_command_sender: NetworkCommandSender,
         execution_controller: Box<dyn ExecutionController>,
         api_settings: APIConfig,
-        consensus_settings: ConsensusConfig,
         node_wallet: Arc<RwLock<Wallet>>,
     ) -> (Self, mpsc::Receiver<()>) {
         let (stop_node_channel, rx) = mpsc::channel(1);
         (
             API(Private {
-                consensus_command_sender,
                 network_command_sender,
                 execution_controller,
-                consensus_config: consensus_settings,
                 api_settings,
                 stop_node_channel,
                 node_wallet,