Delete things related to the number of connected peers

Signed-off-by: s8sato <49983831+s8sato@users.noreply.github.com>

client/tests/tests/mod.rs

@@ -11,7 +11,6 @@ mod offline_peers;
 mod pagination;
 mod permissions;
 mod restart_peer;
-mod status;
 mod transfer_asset;
 mod tx_history;
 mod tx_rollback;

core/src/lib.rs

@@ -246,7 +246,6 @@ where
             Arc::clone(&queue),
             query_validator,
             events_sender,
-            network_addr.clone(),
         );
         let torii = Some(torii);
         Ok(Self {

core/src/torii/mod.rs

@@ -29,7 +29,7 @@ use crate::{
         permissions::IsQueryAllowedBoxed,
     },
     wsv::WorldTrait,
-    Addr, Configuration, IrohaNetwork,
+    Configuration,
 };
 
 /// Main network handler and the only entrypoint of the Iroha.
@@ -39,7 +39,6 @@ pub struct Torii<W: WorldTrait> {
     events: EventsSender,
     query_validator: Arc<IsQueryAllowedBoxed<W>>,
     queue: Arc<Queue>,
-    network: Addr<IrohaNetwork>,
 }
 
 /// Torii errors.
@@ -72,8 +71,8 @@ pub enum Error {
     /// Failed to push into queue.
     #[error("Failed to push into queue")]
     PushIntoQueue(#[source] Box<queue::Error>),
-    /// Error while getting or setting configuration
-    #[error("Failed to get network status")]
+    /// Error while getting status
+    #[error("Failed to get status")]
     Status(#[source] iroha_actor::Error),
 }
 
@@ -129,15 +128,13 @@ impl<W: WorldTrait> Torii<W> {
         queue: Arc<Queue>,
         query_validator: Arc<IsQueryAllowedBoxed<W>>,
         events: EventsSender,
-        network: Addr<IrohaNetwork>,
     ) -> Self {
         Self {
             iroha_cfg,
             wsv,
             events,
             query_validator,
             queue,
-            network,
         }
     }
 
@@ -147,14 +144,12 @@ impl<W: WorldTrait> Torii<W> {
         let queue = Arc::clone(&self.queue);
         let iroha_cfg = self.iroha_cfg.clone();
         let query_validator = Arc::clone(&self.query_validator);
-        let network = self.network.clone();
 
         Arc::new(InnerToriiState {
             iroha_cfg,
             wsv,
             queue,
             query_validator,
-            network,
         })
     }
 
@@ -282,7 +277,6 @@ struct InnerToriiState<W: WorldTrait> {
     wsv: Arc<WorldStateView<W>>,
     queue: Arc<Queue>,
     query_validator: Arc<IsQueryAllowedBoxed<W>>,
-    network: Addr<IrohaNetwork>,
 }
 
 type ToriiState<W> = Arc<InnerToriiState<W>>;
@@ -408,16 +402,9 @@ async fn handle_subscription(events: EventsSender, stream: WebSocket) -> eyre::R
     Ok(())
 }
 
+#[allow(clippy::unused_async)]
 async fn handle_status<W: WorldTrait>(state: ToriiState<W>) -> Result<Json> {
-    let peers = state
-        .network
-        .send(iroha_p2p::network::GetConnectedPeers)
-        .await
-        .map_err(Error::Status)?
-        .peers
-        .len() as u64;
     let status = Status {
-        peers,
         blocks: state.wsv.height(),
     };
     Ok(reply::json(&status))
@@ -445,7 +432,7 @@ pub mod uri {
     pub const STATUS: &str = "status";
     // TODO /// Metrics URI is used to export metrics according to [Prometheus
     // /// Guidance](https://prometheus.io/docs/instrumenting/writing_exporters/).
-    // pub const METRICS: &str = "/metrics";
+    // pub const METRICS: &str = "metrics";
 }
 
 /// This module contains all configuration related logic.
@@ -457,13 +444,13 @@ pub mod config {
     pub const DEFAULT_TORII_P2P_ADDR: &str = "127.0.0.1:1337";
     /// Default socket for listening on external requests
     pub const DEFAULT_TORII_API_URL: &str = "127.0.0.1:8080";
-    /// Default socket for reporting internal metrics
+    /// Default socket for reporting internal status
     pub const DEFAULT_TORII_STATUS_URL: &str = "127.0.0.1:8180";
     /// Default maximum size of single transaction
     pub const DEFAULT_TORII_MAX_TRANSACTION_SIZE: usize = 2_usize.pow(15);
     /// Default maximum instruction number
     pub const DEFAULT_TORII_MAX_INSTRUCTION_NUMBER: u64 = 2_u64.pow(12);
-    /// Default maximum size of [`Sumeragi`] message size
+    /// Default maximum [`Sumeragi`] message size
     pub const DEFAULT_TORII_MAX_SUMERAGI_MESSAGE_SIZE: usize = 2_usize.pow(12) * 4000;
 
     /// `ToriiConfiguration` provides an ability to define parameters such as `TORII_URL`.
@@ -507,7 +494,6 @@ mod tests {
     use std::{convert::TryInto, time::Duration};
 
     use futures::future::FutureExt;
-    use iroha_actor::{broker::Broker, Actor};
     use tokio::time;
 
     use super::*;
@@ -518,6 +504,7 @@ mod tests {
         wsv::World,
     };
 
+    #[allow(clippy::unused_async)]
     async fn create_torii() -> (Torii<World>, KeyPair) {
         let config = get_config(get_trusted_peers(None), None);
         let (events, _) = tokio::sync::broadcast::channel(100);
@@ -539,26 +526,9 @@ mod tests {
             ),
         );
         let queue = Arc::new(Queue::from_configuration(&config.queue));
-        let network = IrohaNetwork::new(
-            Broker::new(),
-            config.torii.p2p_addr.clone(),
-            config.public_key.clone(),
-            config.network.mailbox,
-        )
-        .await
-        .expect("Failed to create network")
-        .start()
-        .await;
 
         (
-            Torii::from_configuration(
-                config,
-                wsv,
-                queue,
-                Arc::new(AllowAll.into()),
-                events,
-                network,
-            ),
+            Torii::from_configuration(config, wsv, queue, Arc::new(AllowAll.into()), events),
             keys,
         )
     }
@@ -979,7 +949,6 @@ mod tests {
             .await
     }
 
-    // FIXME ? move to client integration tests
     #[tokio::test]
     async fn status_committed_block() {
         use iroha_crypto::HashOf;

data_model/src/fixed.rs

@@ -28,7 +28,9 @@ pub type FixNum = FixedPoint<Base, U9>;
 
 /// An encapsulation of [`Fixed`] in encodable form. [`Fixed`] values
 /// should never become negative.
-#[derive(Clone, Copy, Debug, Serialize, Deserialize, IntoSchema, PartialEq, Ord, PartialOrd, Eq)]
+#[derive(
+    Clone, Copy, Debug, Serialize, Deserialize, IntoSchema, PartialEq, Ord, PartialOrd, Eq,
+)]
 pub struct Fixed(FixNum);
 
 impl Fixed {

data_model/src/lib.rs

@@ -382,11 +382,9 @@ pub fn current_time() -> Duration {
         .expect("Failed to get the current system time")
 }
 
-/// Response body for get status request
+/// Response body for GET status request
 #[derive(Clone, Copy, Debug, Default, Deserialize, Serialize)]
 pub struct Status {
-    /// Number of connected peers, except for the reporting peer itself
-    pub peers: u64,
     /// Number of committed blocks
     pub blocks: u64,
 }

docs/source/references/api_spec.md

@@ -166,11 +166,9 @@ Also returns current status of peer in json string:
 
 **Responses**:
 - 200 OK - reports status:
-  + Number of connected peers, except for the reporting peer itself
   + Number of committed blocks
   ```json
   {
-      "peers": 3,
       "blocks": 1
   }
   ```