[fix] #2133: Rewrite topology to be closer the whitepaper.

Signed-off-by: Sam H. Smith <[email protected]>

Author: SamHSmith

core/Cargo.toml

@@ -75,10 +75,6 @@ hex = "0.4.3"
 byte-unit = "4.0.18"
 once_cell = "1.16.0"
 
-[[bench]]
-name = "sumeragi"
-harness = false
-
 [[bench]]
 name = "validation"
 harness = false

core/benches/sumeragi.rs

@@ -5,6 +5,7 @@ use std::{collections::BTreeSet, str::FromStr as _, sync::Arc};
 use criterion::{criterion_group, criterion_main, Criterion};
 use iroha_core::{
     prelude::*,
+    sumeragi::network_topology::Topology,
     tx::{AcceptedTransaction, TransactionValidator},
     wsv::World,
 };
@@ -149,10 +150,12 @@ fn chain_blocks(criterion: &mut Criterion) {
     let _ = criterion.bench_function("chain_block", |b| {
         b.iter(|| {
             success_count += 1;
-            let new_block =
-                block
-                    .clone()
-                    .chain(success_count, Some(previous_block_hash.transmute()), 0);
+            let new_block = block.clone().chain(
+                success_count,
+                Some(previous_block_hash.transmute()),
+                0,
+                Topology::new(Vec::new()),
+            );
             previous_block_hash = new_block.hash();
         });
     });

core/benches/validation.rs

@@ -79,6 +79,7 @@ impl PendingBlock {
         height: u64,
         previous_block_hash: Option<HashOf<VersionedCommittedBlock>>,
         view_change_index: u64,
+        committed_with_topology: Topology,
     ) -> ChainedBlock {
         ChainedBlock {
             transactions: self.transactions,
@@ -91,13 +92,13 @@ impl PendingBlock {
                 previous_block_hash,
                 transactions_hash: None,
                 rejected_transactions_hash: None,
-                genesis_topology: None,
+                committed_with_topology,
             },
         }
     }
 
     /// Create a new blockchain with current block as a first block.
-    pub fn chain_first_with_genesis_topology(self, genesis_topology: Topology) -> ChainedBlock {
+    pub fn chain_first_with_topology(self, genesis_topology: Topology) -> ChainedBlock {
         ChainedBlock {
             transactions: self.transactions,
             event_recommendations: self.event_recommendations,
@@ -109,7 +110,7 @@ impl PendingBlock {
                 previous_block_hash: None,
                 transactions_hash: None,
                 rejected_transactions_hash: None,
-                genesis_topology: Some(genesis_topology),
+                committed_with_topology: genesis_topology,
             },
         }
     }
@@ -127,7 +128,7 @@ impl PendingBlock {
                 previous_block_hash: None,
                 transactions_hash: None,
                 rejected_transactions_hash: None,
-                genesis_topology: None,
+                committed_with_topology: Topology::new(Vec::new()),
             },
         }
     }
@@ -162,8 +163,8 @@ pub struct BlockHeader {
     pub transactions_hash: Option<HashOf<MerkleTree<VersionedSignedTransaction>>>,
     /// Hash of merkle tree root of the tree of rejected transactions' hashes.
     pub rejected_transactions_hash: Option<HashOf<MerkleTree<VersionedSignedTransaction>>>,
-    /// Genesis topology
-    pub genesis_topology: Option<Topology>,
+    /// Network topology when the block was committed.
+    pub committed_with_topology: Topology,
 }
 
 impl BlockHeader {
@@ -388,7 +389,7 @@ impl SignedBlock {
                 previous_block_hash: None,
                 transactions_hash: None,
                 rejected_transactions_hash: None,
-                genesis_topology: None,
+                committed_with_topology: Topology::new(Vec::new()),
             },
             rejected_transactions: Vec::new(),
             transactions: Vec::new(),

core/src/block.rs

@@ -8,7 +8,7 @@
     clippy::arithmetic_side_effects
 )]
 
-use std::{collections::HashSet, fmt::Debug, fs::File, io::BufReader, ops::Deref, path::Path};
+use std::{fmt::Debug, fs::File, io::BufReader, ops::Deref, path::Path};
 
 use derive_more::Deref;
 use eyre::{bail, eyre, Result, WrapErr};
@@ -24,16 +24,11 @@ use iroha_schema::prelude::*;
 use serde::{Deserialize, Serialize};
 use tokio::{time, time::Duration};
 
-use crate::{
-    sumeragi::network_topology::{GenesisBuilder as GenesisTopologyBuilder, Topology},
-    tx::VersionedAcceptedTransaction,
-    IrohaNetwork,
-};
+use crate::{sumeragi::network_topology::Topology, tx::VersionedAcceptedTransaction, IrohaNetwork};
 
 // TODO: 8 is just the optimal value for tests. This number should be
 // revised as soon as we have real data, to fix #1855.
 type Online = SmallVec<[PeerId; 8]>;
-type Offline = SmallVec<[PeerId; 8]>;
 
 /// Time to live for genesis transactions.
 const GENESIS_TRANSACTIONS_TTL_MS: u64 = 100_000;
@@ -88,31 +83,13 @@ async fn try_get_online_topology(
     network_topology: &Topology,
     network: Addr<IrohaNetwork>,
 ) -> Result<Topology> {
-    let (online_peers, offline_peers) =
-        check_peers_status(this_peer_id, network_topology, network).await;
+    let online_peers = check_peers_status(this_peer_id, network_topology, network).await;
     let set_a_len = network_topology.min_votes_for_commit();
     if online_peers.len() < set_a_len {
-        return Err(eyre!("Not enough online peers for consensus."));
+        eyre::bail!("Not enough online peers for consensus.");
     }
-    let genesis_topology = if network_topology.sorted_peers().len() == 1 {
-        network_topology.clone()
-    } else {
-        let set_a: HashSet<_> = online_peers[..set_a_len].iter().cloned().collect();
-        let set_b: HashSet<_> = online_peers[set_a_len..]
-            .iter()
-            .cloned()
-            .chain(offline_peers.into_iter())
-            .collect();
-        #[allow(clippy::expect_used)]
-        GenesisTopologyBuilder::new()
-            .with_leader(this_peer_id.clone())
-            .with_set_a(set_a)
-            .with_set_b(set_b)
-            .build()
-            .expect("Preconditions should be already checked.")
-    };
     iroha_logger::info!("Waiting for active peers finished.");
-    Ok(genesis_topology)
+    Ok(network_topology.clone())
 }
 
 /// Checks which [`Peer`]s are online and which are offline
@@ -121,7 +98,7 @@ async fn check_peers_status(
     this_peer_id: &PeerId,
     network_topology: &Topology,
     network: Addr<IrohaNetwork>,
-) -> (Online, Offline) {
+) -> Online {
     #[allow(clippy::expect_used)]
     let peers = network
         .send(iroha_p2p::network::GetConnectedPeers)
@@ -130,13 +107,13 @@ async fn check_peers_status(
         .peers;
     iroha_logger::info!(peer_count = peers.len(), "Peers status");
 
-    let (online, offline): (SmallVec<_>, SmallVec<_>) = network_topology
-        .sorted_peers()
+    let (online, _offline): (SmallVec<_>, SmallVec<_>) = network_topology
+        .sorted_peers
         .iter()
         .cloned()
         .partition(|id| peers.contains(&id.public_key) || this_peer_id.public_key == id.public_key);
 
-    (online, offline)
+    online
 }
 
 #[async_trait::async_trait]

core/src/genesis.rs

@@ -255,7 +255,12 @@ mod tests {
 
         for height in 1u64..blocks {
             let block: VersionedCommittedBlock = PendingBlock::new(transactions.clone(), vec![])
-                .chain(height, Some(curr_hash), 0)
+                .chain(
+                    height,
+                    Some(curr_hash),
+                    0,
+                    crate::sumeragi::network_topology::Topology::new(vec![]),
+                )
                 .validate(&TransactionValidator::new(limits), &wsv)
                 .sign(ALICE_KEYS.clone())
                 .expect("Failed to sign blocks.")