rust update to 1.54

Signed-off-by: i1i1 <vanyarybin1@live.ru>
hyperledger · Aug 3, 2021 · 1a63f7c · 1a63f7c
1 parent 7fe09ca
commit 1a63f7c
Show file tree

Hide file tree

Showing 46 changed files with 224 additions and 244 deletions.
diff --git a/.github/workflows/iroha2-dev-pr.yml b/.github/workflows/iroha2-dev-pr.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   check:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -53,7 +53,7 @@ jobs:
 
   test:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -73,7 +73,7 @@ jobs:
 
   test-iroha_network-mock:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -97,7 +97,7 @@ jobs:
 
   test-deadlock_detection:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -128,7 +128,7 @@ jobs:
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.52
+          toolchain: 1.54
       - name: Install dependencies
         if: ${{ false }}
         run: |
@@ -152,7 +152,7 @@ jobs:
 
   print-telemetry:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -240,7 +240,7 @@ jobs:
   # 2  Coverage bot can have results from `iroha2-dev` to report accurate coverage changes.
   coverage:
     runs-on: [self-hosted, Linux]
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -277,7 +277,7 @@ jobs:
 
   bench:
     runs-on: [self-hosted, Linux]
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     if: ${{ false }}
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
@@ -14,7 +14,7 @@ env:
 jobs:
   archive-artifacts:
     runs-on: [self-hosted, Linux]
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -49,7 +49,7 @@ jobs:
 
   deploy:
     runs-on: [self-hosted, Linux]
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - name: Check Dockerhub credentials
@@ -88,7 +88,7 @@ jobs:
   # 2  Coverage bot can have results from `iroha2-dev` to report accurate coverage changes.
   coverage:
     runs-on: [self-hosted, Linux]
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies

diff --git a/.github/workflows/iroha2.yml b/.github/workflows/iroha2.yml
@@ -16,7 +16,7 @@ env:
 jobs:
   coverage:
     runs-on: [self-hosted, Linux] #ubuntu-latest
-    container: rust:1.52-buster
+    container: rust:1.54-buster
     steps:
       - uses: actions/checkout@v2
       - name: Set nightly toolchain

diff --git a/clippy.toml b/clippy.toml
@@ -0,0 +1 @@
+avoid-breaking-exported-api = false
diff --git a/iroha/benches/validation.rs b/iroha/benches/validation.rs
@@ -53,8 +53,8 @@ fn build_test_wsv(keys: &KeyPair) -> WorldStateView<World> {
         let account_id = AccountId::new(START_ACCOUNT, START_DOMAIN);
         let mut account = Account::new(account_id.clone());
         account.signatories.push(keys.public_key.clone());
-        drop(domain.accounts.insert(account_id, account));
-        drop(domains.insert(START_DOMAIN.to_string(), domain));
+        domain.accounts.insert(account_id, account);
+        domains.insert(START_DOMAIN.to_string(), domain);
         World::with(domains, BTreeSet::new())
     })
 }
@@ -173,14 +173,14 @@ fn validate_blocks(criterion: &mut Criterion) {
     let account_id = AccountId::new("root", &domain_name);
     let account = Account::with_signatory(account_id.clone(), key_pair.public_key);
     let mut accounts = BTreeMap::new();
-    drop(accounts.insert(account_id, account));
+    accounts.insert(account_id, account);
     let domain = Domain {
         name: domain_name.clone(),
         accounts,
         asset_definitions,
     };
     let mut domains = BTreeMap::new();
-    drop(domains.insert(domain_name, domain));
+    domains.insert(domain_name, domain);
     let wsv = WorldStateView::new(World::with(domains, BTreeSet::new()));
     // Pepare test transaction
     let keys = KeyPair::generate().expect("Failed to generate keys");

diff --git a/iroha/docs/src/main.rs b/iroha/docs/src/main.rs
@@ -67,7 +67,7 @@ where
                 Value::String(s) => (s.clone(), false),
                 _ => unreachable!("Only strings and objects in docs"),
             };
-            let doc = doc.strip_prefix(" ").unwrap_or(&doc);
+            let doc = doc.strip_prefix(' ').unwrap_or(&doc);
             let defaults = Self::default()
                 .get_recursive(get_field)
                 .expect("Failed to get defaults.");
@@ -86,7 +86,7 @@ where
                 Self::get_markdown_with_depth(writer, docs, field, depth + 1)?;
             }
 
-            drop(field.pop());
+            field.pop();
         }
         Ok(())
     }

diff --git a/iroha/src/block.rs b/iroha/src/block.rs
@@ -52,7 +52,7 @@ impl Chain {
     /// Put latest block.
     pub fn push(&self, block: VersionedCommittedBlock) {
         let height = block.as_inner_v1().header.height;
-        drop(self.blocks.insert(height, block));
+        self.blocks.insert(height, block);
     }
 
     /// Iterator over height and block.
@@ -633,7 +633,7 @@ impl From<&CommittedBlock> for Vec<Event> {
             .header
             .invalidated_blocks_hashes
             .iter()
-            .cloned()
+            .copied()
             .map(|hash| {
                 PipelineEvent::new(
                     PipelineEntityType::Block,

diff --git a/iroha/src/block_sync.rs b/iroha/src/block_sync.rs
@@ -113,16 +113,14 @@ impl<S: SumeragiTrait, W: WorldTrait> Handler<ReceiveUpdates> for BlockSynchroni
             self.wsv.latest_block_hash(),
             self.peer_id.clone(),
         ));
-        drop(
-            futures::future::join_all(
-                self.sumeragi
-                    .send(GetSortedPeers)
-                    .await
-                    .iter()
-                    .map(|peer| message.clone().send_to(peer)),
-            )
-            .await,
-        );
+        futures::future::join_all(
+            self.sumeragi
+                .send(GetSortedPeers)
+                .await
+                .iter()
+                .map(|peer| message.clone().send_to(peer)),
+        )
+        .await;
     }
 }
 

diff --git a/iroha/src/kura.rs b/iroha/src/kura.rs
@@ -428,7 +428,7 @@ mod tests {
         let dir = tempfile::tempdir().unwrap();
         let mut kura =
             Kura::<World>::new(Mode::Strict, dir.path(), Arc::default(), Broker::new()).unwrap();
-        drop(kura.init().await.expect("Failed to init Kura."));
+        kura.init().await.expect("Failed to init Kura.");
         let _ = kura
             .store(block)
             .await

diff --git a/iroha/src/lib.rs b/iroha/src/lib.rs
@@ -145,11 +145,9 @@ where
 
         #[cfg(feature = "telemetry")]
         if let Some(telemetry) = telemetry {
-            drop(
-                telemetry::start(&config.telemetry, telemetry)
-                    .await
-                    .wrap_err("Failed to setup telemetry")?,
-            );
+            telemetry::start(&config.telemetry, telemetry)
+                .await
+                .wrap_err("Failed to setup telemetry")?;
         }
         let query_validator = Arc::new(query_validator);
         let sumeragi: AlwaysAddr<_> = S::from_configuration(

diff --git a/iroha/src/queue.rs b/iroha/src/queue.rs
@@ -182,23 +182,19 @@ impl<W: WorldTrait> Queue<W> {
             }
 
             if expired || tx.is_in_blockchain(&*self.wsv) {
-                drop(
-                    self.pending_tx_by_hash
-                        .remove(&tx_hash)
-                        .expect("Should always be present, as contained in queue"),
-                );
+                self.pending_tx_by_hash
+                    .remove(&tx_hash)
+                    .expect("Should always be present, as contained in queue");
                 continue;
             }
 
             let signature_condition_passed = match tx.check_signature_condition(&*self.wsv) {
                 Ok(passed) => passed,
                 Err(e) => {
                     iroha_logger::error!(%e, "Not passed signature");
-                    drop(
-                        self.pending_tx_by_hash
-                            .remove(&tx_hash)
-                            .expect("Should always be present, as contained in queue"),
-                    );
+                    self.pending_tx_by_hash
+                        .remove(&tx_hash)
+                        .expect("Should always be present, as contained in queue");
                     continue;
                 }
             };
@@ -291,8 +287,8 @@ mod tests {
         let account_id = AccountId::new("alice", "wonderland");
         let mut account = Account::new(account_id.clone());
         account.signatories.push(public_key);
-        drop(domain.accounts.insert(account_id, account));
-        drop(domains.insert("wonderland".to_string(), domain));
+        domain.accounts.insert(account_id, account);
+        domains.insert("wonderland".to_string(), domain);
         World::with(domains, PeersIds::new())
     }
 

diff --git a/iroha/src/smartcontracts/isi/account.rs b/iroha/src/smartcontracts/isi/account.rs
@@ -62,7 +62,7 @@ pub mod isi {
                     .iter()
                     .position(|key| key == &public_key)
                 {
-                    drop(account.signatories.remove(index));
+                    account.signatories.remove(index);
                 }
                 Ok(())
             })?;
@@ -81,11 +81,11 @@ pub mod isi {
             let account_metadata_limits = wsv.config.account_metadata_limits;
             let id = self.object_id.clone();
             wsv.modify_account(&id, |account| {
-                drop(account.metadata.insert_with_limits(
+                account.metadata.insert_with_limits(
                     self.key.clone(),
                     self.value,
                     account_metadata_limits,
-                ));
+                )?;
                 Ok(())
             })?;
             Ok(())
@@ -101,12 +101,10 @@ pub mod isi {
             wsv: &WorldStateView<W>,
         ) -> Result<(), Error> {
             wsv.modify_account(&self.object_id, |account| {
-                drop(
-                    account
-                        .metadata
-                        .remove(&self.key)
-                        .ok_or_else(|| FindError::MetadataKey(self.key.clone()))?,
-                );
+                account
+                    .metadata
+                    .remove(&self.key)
+                    .ok_or_else(|| FindError::MetadataKey(self.key.clone()))?;
                 Ok(())
             })?;
             Ok(())
@@ -139,12 +137,10 @@ pub mod isi {
             _authority: <Account as Identifiable>::Id,
             wsv: &WorldStateView<W>,
         ) -> Result<(), Error> {
-            drop(
-                wsv.world()
-                    .roles
-                    .get(&self.object)
-                    .ok_or_else(|| FindError::Role(self.object.clone()))?,
-            );
+            wsv.world()
+                .roles
+                .get(&self.object)
+                .ok_or_else(|| FindError::Role(self.object.clone()))?;
 
             let id = self.destination_id.clone();
             wsv.modify_account(&id, |account| {
@@ -212,7 +208,7 @@ pub mod query {
                 .id
                 .evaluate(wsv, &Context::default())
                 .wrap_err("Failed to get id")?;
-            Ok(wsv.map_account(&id, Clone::clone)?)
+            wsv.map_account(&id, Clone::clone)
         }
     }
 

diff --git a/iroha/src/smartcontracts/isi/asset.rs b/iroha/src/smartcontracts/isi/asset.rs
@@ -50,7 +50,7 @@ pub mod isi {
                 wsv,
                 AssetValueType::Quantity,
             )?;
-            drop(wsv.asset_or_insert(&self.destination_id, 0_u32)?);
+            wsv.asset_or_insert(&self.destination_id, 0_u32)?;
             wsv.modify_asset(&self.destination_id, |asset| {
                 let quantity: &mut u32 = asset.try_as_mut()?;
                 *quantity = quantity
@@ -75,7 +75,7 @@ pub mod isi {
                 wsv,
                 AssetValueType::BigQuantity,
             )?;
-            drop(wsv.asset_or_insert(&self.destination_id, 0_u128)?);
+            wsv.asset_or_insert(&self.destination_id, 0_u128)?;
             wsv.modify_asset(&self.destination_id, |asset| {
                 let quantity: &mut u128 = asset.try_as_mut()?;
                 *quantity = quantity
@@ -97,14 +97,14 @@ pub mod isi {
         ) -> Result<(), Error> {
             assert_asset_type(&self.object_id.definition_id, wsv, AssetValueType::Store)?;
             let asset_metadata_limits = wsv.config.asset_metadata_limits;
-            drop(wsv.asset_or_insert(&self.object_id, Metadata::new())?);
+            wsv.asset_or_insert(&self.object_id, Metadata::new())?;
             wsv.modify_asset(&self.object_id, |asset| {
                 let store: &mut Metadata = asset.try_as_mut()?;
-                drop(store.insert_with_limits(
+                store.insert_with_limits(
                     self.key.clone(),
                     self.value.clone(),
                     asset_metadata_limits,
-                ));
+                )?;
                 Ok(())
             })?;
             Ok(())
@@ -170,11 +170,9 @@ pub mod isi {
             assert_asset_type(&self.object_id.definition_id, wsv, AssetValueType::Store)?;
             wsv.modify_asset(&self.object_id, |asset| {
                 let store: &mut Metadata = asset.try_as_mut()?;
-                drop(
-                    store
-                        .remove(&self.key)
-                        .ok_or_else(|| FindError::MetadataKey(self.key.clone()))?,
-                );
+                store
+                    .remove(&self.key)
+                    .ok_or_else(|| FindError::MetadataKey(self.key.clone()))?;
                 Ok(())
             })?;
             Ok(())
@@ -206,7 +204,7 @@ pub mod isi {
                     .ok_or_else(|| error!("Source account does not have enough asset quantity."))?;
                 Ok(())
             })?;
-            drop(wsv.asset_or_insert(&self.destination_id, 0_u32));
+            wsv.asset_or_insert(&self.destination_id, 0_u32)?;
             wsv.modify_asset(&self.destination_id, |asset| {
                 let quantity: &mut u32 = asset.try_as_mut()?;
                 *quantity = quantity