[fix] #1897: Removed usize/isize from serialization

actor/src/lib.rs

@@ -1,5 +1,6 @@
 //! Iroha simple actor framework.
 #![allow(clippy::same_name_method)]
+#![allow(clippy::expect_used)]
 
 #[cfg(feature = "deadlock_detection")]
 use std::any::type_name;
@@ -288,7 +289,7 @@ where
 #[async_trait::async_trait]
 pub trait Actor: Send + Sized + 'static {
     /// Capacity of actor queue
-    fn mailbox_capacity(&self) -> usize {
+    fn mailbox_capacity(&self) -> u32 {
         100
     }
 
@@ -305,7 +306,12 @@ pub trait Actor: Send + Sized + 'static {
     /// Initialize actor with its address.
     fn preinit(self) -> InitializedActor<Self> {
         let mailbox_capacity = self.mailbox_capacity();
-        InitializedActor::new(self, mailbox_capacity)
+        InitializedActor::new(
+            self,
+            mailbox_capacity
+                .try_into()
+                .expect("u32 should always fit in usize"),
+        )
     }
 
     /// Initialize actor with default values

cli/src/config.rs

@@ -69,10 +69,10 @@ pub struct Configuration {
 #[config(env_prefix = "IROHA_NETWORK_")]
 pub struct NetworkConfiguration {
     /// Actor mailbox size
-    pub mailbox: usize,
+    pub mailbox: u32,
 }
 
-const DEFAULT_MAILBOX_SIZE: usize = 100;
+const DEFAULT_MAILBOX_SIZE: u32 = 100;
 
 impl Default for NetworkConfiguration {
     fn default() -> Self {

cli/src/torii/config.rs

@@ -8,9 +8,9 @@ pub const DEFAULT_TORII_P2P_ADDR: &str = "127.0.0.1:1337";
 /// Default socket for reporting internal status and metrics
 pub const DEFAULT_TORII_TELEMETRY_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);
+pub const DEFAULT_TORII_MAX_TRANSACTION_SIZE: u32 = 2_u32.pow(15);
 /// Default upper bound on `content-length` specified in the HTTP request header
-pub const DEFAULT_TORII_MAX_CONTENT_LENGTH: usize = 2_usize.pow(12) * 4000;
+pub const DEFAULT_TORII_MAX_CONTENT_LENGTH: u32 = 2_u32.pow(12) * 4000;
 
 /// Structure that defines the configuration parameters of `Torii` which is the routing module.
 /// For example the `p2p_addr`, which is used for consensus and block-synchronisation purposes,
@@ -27,9 +27,9 @@ pub struct ToriiConfiguration {
     /// Torii URL for reporting internal status and metrics for administration.
     pub telemetry_url: String,
     /// Maximum number of bytes in raw transaction. Used to prevent from DOS attacks.
-    pub max_transaction_size: usize,
+    pub max_transaction_size: u32,
     /// Maximum number of bytes in raw message. Used to prevent from DOS attacks.
-    pub max_content_len: usize,
+    pub max_content_len: u32,
 }
 
 impl Default for ToriiConfiguration {

cli/src/torii/routing.rs

@@ -431,7 +431,7 @@ impl<W: WorldTrait> Torii<W> {
             warp::path(uri::TRANSACTION)
                 .and(add_state!(self.iroha_cfg, self.queue))
                 .and(warp::body::content_length_limit(
-                    self.iroha_cfg.torii.max_content_len as u64,
+                    self.iroha_cfg.torii.max_content_len.into(),
                 ))
                 .and(body::versioned()),
         )

core/src/block_sync.rs

@@ -43,7 +43,7 @@ pub struct BlockSynchronizer<S: SumeragiTrait, W: WorldTrait> {
     gossip_period: Duration,
     batch_size: u32,
     broker: Broker,
-    mailbox: usize,
+    mailbox: u32,
 }
 
 /// Block synchronizer
@@ -99,7 +99,7 @@ pub struct ReceiveUpdates;
 
 #[async_trait::async_trait]
 impl<S: SumeragiTrait, W: WorldTrait> Actor for BlockSynchronizer<S, W> {
-    fn mailbox_capacity(&self) -> usize {
+    fn mailbox_capacity(&self) -> u32 {
         self.mailbox
     }
 
@@ -350,7 +350,7 @@ pub mod config {
 
     const DEFAULT_BATCH_SIZE: u32 = 4;
     const DEFAULT_GOSSIP_PERIOD_MS: u64 = 10000;
-    const DEFAULT_MAILBOX_SIZE: usize = 100;
+    const DEFAULT_MAILBOX_SIZE: u32 = 100;
 
     /// Configuration for `BlockSynchronizer`.
     #[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize, Configurable)]
@@ -364,7 +364,7 @@ pub mod config {
         /// Underlying network (`iroha_network`) should support transferring messages this large.
         pub batch_size: u32,
         /// Mailbox size
-        pub mailbox: usize,
+        pub mailbox: u32,
     }
 
     impl Default for BlockSyncConfiguration {

core/src/kura.rs

@@ -53,7 +53,7 @@ pub struct KuraWithIO<W: WorldTrait, IO> {
     merkle_tree: MerkleTree<VersionedCommittedBlock>,
     wsv: Arc<WorldStateView<W>>,
     broker: Broker,
-    mailbox: usize,
+    mailbox: u32,
 }
 
 /// Production qualification of `KuraWithIO`
@@ -70,7 +70,7 @@ impl<W: WorldTrait, IO: DiskIO> KuraWithIO<W, IO> {
         blocks_per_file: NonZeroU64,
         wsv: Arc<WorldStateView<W>>,
         broker: Broker,
-        mailbox: usize,
+        mailbox: u32,
         io: IO,
     ) -> Result<Self> {
         Ok(Self {
@@ -105,7 +105,7 @@ pub trait KuraTrait:
         blocks_per_file: NonZeroU64,
         wsv: Arc<WorldStateView<Self::World>>,
         broker: Broker,
-        mailbox: usize,
+        mailbox: u32,
     ) -> Result<Self>;
 
     /// Loads kura from configuration
@@ -138,7 +138,7 @@ impl<W: WorldTrait> KuraTrait for Kura<W> {
         blocks_per_file: NonZeroU64,
         wsv: Arc<WorldStateView<W>>,
         broker: Broker,
-        mailbox: usize,
+        mailbox: u32,
     ) -> Result<Self> {
         Self::new_meta(
             mode,
@@ -155,7 +155,7 @@ impl<W: WorldTrait> KuraTrait for Kura<W> {
 
 #[async_trait::async_trait]
 impl<W: WorldTrait, IO: DiskIO> Actor for KuraWithIO<W, IO> {
-    fn mailbox_capacity(&self) -> usize {
+    fn mailbox_capacity(&self) -> u32 {
         self.mailbox
     }
 
@@ -486,7 +486,7 @@ pub mod config {
 
     const DEFAULT_BLOCKS_PER_STORAGE_FILE: u64 = 1000_u64;
     const DEFAULT_BLOCK_STORE_PATH: &str = "./blocks";
-    const DEFAULT_MAILBOX_SIZE: usize = 100;
+    const DEFAULT_MAILBOX_SIZE: u32 = 100;
 
     /// Configuration of kura
     #[derive(Clone, Deserialize, Serialize, Debug, Configurable, PartialEq, Eq)]
@@ -504,7 +504,7 @@ pub mod config {
         pub blocks_per_storage_file: NonZeroU64,
         /// Default mailbox size
         #[serde(default = "default_mailbox_size")]
-        pub mailbox: usize,
+        pub mailbox: u32,
     }
 
     impl Default for KuraConfiguration {
@@ -543,7 +543,7 @@ pub mod config {
         )
     }
 
-    const fn default_mailbox_size() -> usize {
+    const fn default_mailbox_size() -> u32 {
         DEFAULT_MAILBOX_SIZE
     }
 }

core/src/queue.rs

@@ -1,4 +1,5 @@
 //! Module with queue actor
+#![allow(clippy::expect_used)]
 
 use std::{sync::Arc, time::Duration};
 
@@ -80,12 +81,15 @@ impl<W: WorldTrait> Queue<W> {
     }
 
     /// Returns `n` randomly selected transaction from the queue.
-    pub fn n_random_transactions(&self, n: usize) -> Vec<VersionedAcceptedTransaction> {
+    pub fn n_random_transactions(&self, n: u32) -> Vec<VersionedAcceptedTransaction> {
         self.txs
             .iter()
             .filter(|e| self.is_pending(e.value()))
             .map(|e| e.value().clone())
-            .choose_multiple(&mut rand::thread_rng(), n)
+            .choose_multiple(
+                &mut rand::thread_rng(),
+                n.try_into().expect("u32 should always fit in usize"),
+            )
     }
 
     fn check_tx(&self, tx: &VersionedAcceptedTransaction) -> Result<(), Error> {

core/src/smartcontracts/wasm.rs

@@ -1,6 +1,7 @@
 //! This module contains logic related to executing smartcontracts via
 //! `WebAssembly` VM Smartcontracts can be written in Rust, compiled
 //! to wasm format and submitted in a transaction
+#![allow(clippy::expect_used)]
 
 use std::sync::Arc;
 
@@ -140,7 +141,9 @@ impl<'a, W: WorldTrait> State<'a, W> {
             validator: None,
 
             store_limits: StoreLimitsBuilder::new()
-                .memory_size(config.max_memory)
+                .memory_size(config.max_memory.try_into().expect(
+                    "config.max_memory is a u32 so this can't fail on any supported platform",
+                ))
                 .instances(1)
                 .memories(1)
                 .tables(1)
@@ -491,7 +494,7 @@ pub mod config {
     use serde::{Deserialize, Serialize};
 
     const DEFAULT_FUEL_LIMIT: u64 = 1_000_000;
-    const DEFAULT_MAX_MEMORY: usize = 500 * 2_usize.pow(20); // 500 MiB
+    const DEFAULT_MAX_MEMORY: u32 = 500 * 2_u32.pow(20); // 500 MiB
 
     /// [`WebAssembly Runtime`](super::Runtime) configuration.
     #[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize, Configurable)]
@@ -503,7 +506,7 @@ pub mod config {
         pub fuel_limit: u64,
 
         /// Maximum amount of linear memory a given smartcontract can allocate
-        pub max_memory: usize,
+        pub max_memory: u32,
     }
 
     impl Default for Configuration {

core/src/sumeragi/config.rs

@@ -15,9 +15,9 @@ pub const DEFAULT_COMMIT_TIME_MS: u64 = 2000;
 /// Default amount of time Peer waits for `TxReceipt` from the leader.
 pub const DEFAULT_TX_RECEIPT_TIME_MS: u64 = 500;
 const DEFAULT_N_TOPOLOGY_SHIFTS_BEFORE_RESHUFFLE: u64 = 1;
-const DEFAULT_MAILBOX_SIZE: usize = 100;
+const DEFAULT_MAILBOX_SIZE: u32 = 100;
 const DEFAULT_GOSSIP_PERIOD_MS: u64 = 1000;
-const DEFAULT_GOSSIP_BATCH_SIZE: usize = 500;
+const DEFAULT_GOSSIP_BATCH_SIZE: u32 = 500;
 
 /// `SumeragiConfiguration` provides an ability to define parameters such as `BLOCK_TIME_MS`
 /// and list of `TRUSTED_PEERS`.
@@ -44,9 +44,9 @@ pub struct SumeragiConfiguration {
     /// Limits to which transactions must adhere
     pub transaction_limits: TransactionLimits,
     /// Mailbox size
-    pub mailbox: usize,
+    pub mailbox: u32,
     /// Maximum number of transactions in tx gossip batch message. While configuring this, attention should be payed to `p2p` max message size.
-    pub gossip_batch_size: usize,
+    pub gossip_batch_size: u32,
     /// Period in milliseconds for pending transaction gossiping between peers.
     pub gossip_period_ms: u64,
 }

core/src/sumeragi/fault.rs

@@ -94,9 +94,9 @@ where
     /// [`iroha_p2p::Network`] actor address
     pub network: Addr<IrohaNetwork>,
     /// Mailbox size
-    pub mailbox: usize,
+    pub mailbox: u32,
     pub(crate) fault_injection: PhantomData<F>,
-    pub(crate) gossip_batch_size: usize,
+    pub(crate) gossip_batch_size: u32,
     pub(crate) gossip_period: Duration,
 }
 
@@ -161,7 +161,7 @@ impl<G: GenesisNetworkTrait, K: KuraTrait<World = W>, W: WorldTrait, F: FaultInj
 impl<G: GenesisNetworkTrait, K: KuraTrait, W: WorldTrait, F: FaultInjection> Actor
     for SumeragiWithFault<G, K, W, F>
 {
-    fn mailbox_capacity(&self) -> usize {
+    fn mailbox_capacity(&self) -> u32 {
         self.mailbox
     }
 

data_model/src/lib.rs

@@ -1,7 +1,7 @@
 //! Iroha Data Model contains structures for Domains, Peers, Accounts and Assets with simple,
 //! non-specific functions like serialization.
 
-#![allow(clippy::module_name_repetitions)]
+#![allow(clippy::module_name_repetitions, clippy::unwrap_in_result)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[cfg(not(feature = "std"))]

data_model/src/pagination.rs

@@ -1,4 +1,5 @@
 //! Structures and traits related to pagination.
+#![allow(clippy::expect_used)]
 
 #[cfg(not(feature = "std"))]
 use alloc::{
@@ -60,7 +61,8 @@ impl<I: Iterator> Iterator for Paginated<I> {
         #[allow(clippy::option_if_let_else)]
         // Required because of E0524. 2 closures with unique refs to self
         if let Some(start) = self.pagination.start.take() {
-            self.iter.nth(start)
+            self.iter
+                .nth(start.try_into().expect("u32 should always fit in usize"))
         } else {
             self.iter.next()
         }
@@ -71,14 +73,14 @@ impl<I: Iterator> Iterator for Paginated<I> {
 #[derive(Clone, Eq, PartialEq, Debug, Default, Copy, Deserialize, Serialize)]
 pub struct Pagination {
     /// start of indexing
-    pub start: Option<usize>,
+    pub start: Option<u32>,
     /// limit of indexing
-    pub limit: Option<usize>,
+    pub limit: Option<u32>,
 }
 
 impl Pagination {
     /// Constructs [`Pagination`].
-    pub const fn new(start: Option<usize>, limit: Option<usize>) -> Self {
+    pub const fn new(start: Option<u32>, limit: Option<u32>) -> Self {
         Self { start, limit }
     }
 }
@@ -129,10 +131,25 @@ impl From<Pagination> for Vec<(&'static str, usize)> {
     fn from(pagination: Pagination) -> Self {
         match (pagination.start, pagination.limit) {
             (Some(start), Some(limit)) => {
-                vec![(PAGINATION_START, start), (PAGINATION_LIMIT, limit)]
+                vec![
+                    (
+                        PAGINATION_START,
+                        start.try_into().expect("u32 should always fit in usize"),
+                    ),
+                    (
+                        PAGINATION_LIMIT,
+                        limit.try_into().expect("u32 should always fit in usize"),
+                    ),
+                ]
             }
-            (Some(start), None) => vec![(PAGINATION_START, start)],
-            (None, Some(limit)) => vec![(PAGINATION_LIMIT, limit)],
+            (Some(start), None) => vec![(
+                PAGINATION_START,
+                start.try_into().expect("u32 should always fit in usize"),
+            )],
+            (None, Some(limit)) => vec![(
+                PAGINATION_LIMIT,
+                limit.try_into().expect("u32 should always fit in usize"),
+            )],
             (None, None) => Vec::new(),
         }
     }