refactor: merge and clean

massalabs · Nov 16, 2022 · 4c610c5 · 4c610c5
1 parent a182551
commit 4c610c5
Show file tree

Hide file tree

Showing 13 changed files with 183 additions and 217 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/massa-api/Cargo.toml b/massa-api/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 displaydoc = "0.2"
-jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "master", features = ["server", "macros"] }
+jsonrpsee = { version = "0.16.0", features = ["server", "macros"] }
 async-trait = "0.1.58"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.87"

diff --git a/massa-api/src/lib.rs b/massa-api/src/lib.rs
@@ -7,7 +7,7 @@ use crate::error::ApiError::WrongAPI;
 use jsonrpsee::core::{Error as JsonRpseeError, RpcResult};
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::server::{ServerBuilder, ServerHandle};
-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,

diff --git a/massa-api/src/private.rs b/massa-api/src/private.rs
@@ -6,7 +6,6 @@ use crate::{MassaRpcServer, Private, RpcServer, StopHandle, Value, API};
 
 use async_trait::async_trait;
 use jsonrpsee::core::{Error as JsonRpseeError, RpcResult};
-use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
 use massa_execution_exports::ExecutionController;
 use massa_models::api::{
     AddressInfo, BlockInfo, BlockSummary, DatastoreEntryInput, DatastoreEntryOutput,