Merge branch 'feature/network/whitelist_peers' into feature/api/white…

…list
Arthur-Daniels · Mar 10, 2022 · ea0bfa4 · ea0bfa4
2 parents 4759df8 + 984e198
commit ea0bfa4
Show file tree

Hide file tree

Showing 101 changed files with 2,461 additions and 2,102 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,7 +105,6 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
 
   # Full cross-platform tests required by bors to merge on main branch
   full:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,8 +11,10 @@ members = [
   "massa-hash",
   "massa-logging",
   "massa-models",
-  "massa-network",
+  "massa-network-worker",
+  "massa-network-exports",
   "massa-node",
+  "massa-sdk",
   "massa-pool",
   "massa-proof-of-stake-exports",
   "massa-protocol-exports",

diff --git a/massa-api/Cargo.toml b/massa-api/Cargo.toml
@@ -20,11 +20,11 @@ massa_execution_exports = { path = "../massa-execution-exports" }
 massa_graph = { path = "../massa-graph" }
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
-massa_network = { path = "../massa-network" }
+massa_network_exports = { path = "../massa-network-exports" }
 massa_pool = { path = "../massa-pool" }
 massa_protocol_exports = { path = "../massa-protocol-exports" }
 massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [features]
-instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network/instrument", "massa_pool/instrument", "massa_protocol_exports/instrument", "massa_time/instrument"]
+instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network_exports/instrument", "massa_pool/instrument", "massa_protocol_exports/instrument", "massa_time/instrument"]
diff --git a/massa-api/src/error.rs b/massa-api/src/error.rs
@@ -5,7 +5,7 @@ use massa_consensus_exports::error::ConsensusError;
 use massa_execution_exports::ExecutionError;
 use massa_hash::MassaHashError;
 use massa_models::ModelsError;
-use massa_network::NetworkError;
+use massa_network_exports::NetworkError;
 use massa_pool::PoolError;
 use massa_time::TimeError;
 use thiserror::Error;

diff --git a/massa-api/src/lib.rs b/massa-api/src/lib.rs
@@ -17,11 +17,11 @@ use massa_models::clique::Clique;
 use massa_models::composite::PubkeySig;
 use massa_models::execution::ExecuteReadOnlyResponse;
 use massa_models::node::NodeId;
-use massa_models::operation::{Operation, OperationId};
+use massa_models::operation::OperationId;
 use massa_models::output_event::SCOutputEvent;
 use massa_models::prehash::{Map, Set};
-use massa_models::{Address, BlockId, EndorsementId, Version};
-use massa_network::{NetworkCommandSender, NetworkSettings};
+use massa_models::{Address, BlockId, EndorsementId, SignedOperation, Version};
+use massa_network_exports::{NetworkCommandSender, NetworkSettings};
 use massa_pool::PoolCommandSender;
 use massa_signature::PrivateKey;
 use std::net::{IpAddr, SocketAddr};
@@ -192,7 +192,10 @@ pub trait Endpoints {
 
     /// Adds operations to pool. Returns operations that were ok and sent to pool.
     #[rpc(name = "send_operations")]
-    fn send_operations(&self, _: Vec<Operation>) -> BoxFuture<Result<Vec<OperationId>, ApiError>>;
+    fn send_operations(
+        &self,
+        _: Vec<SignedOperation>,
+    ) -> BoxFuture<Result<Vec<OperationId>, ApiError>>;
 
     /// Get events optionnally filtered by:
     /// * start slot

diff --git a/massa-api/src/private.rs b/massa-api/src/private.rs
@@ -15,8 +15,8 @@ use massa_models::composite::PubkeySig;
 use massa_models::execution::ExecuteReadOnlyResponse;
 use massa_models::output_event::SCOutputEvent;
 use massa_models::prehash::{Map, Set};
-use massa_models::{Address, BlockId, EndorsementId, Operation, OperationId};
-use massa_network::NetworkCommandSender;
+use massa_models::{Address, BlockId, EndorsementId, OperationId, SignedOperation};
+use massa_network_exports::NetworkCommandSender;
 use massa_signature::PrivateKey;
 use std::net::{IpAddr, SocketAddr};
 
@@ -150,7 +150,10 @@ impl Endpoints for API<Private> {
         crate::wrong_api::<Vec<AddressInfo>>()
     }
 
-    fn send_operations(&self, _: Vec<Operation>) -> BoxFuture<Result<Vec<OperationId>, ApiError>> {
+    fn send_operations(
+        &self,
+        _: Vec<SignedOperation>,
+    ) -> BoxFuture<Result<Vec<OperationId>, ApiError>> {
         crate::wrong_api::<Vec<OperationId>>()
     }