upgrade rust to 1.75.0

1. silence `default-features=false` warnings 2. silence some clippy warnings 3. fix consensus test case 4. remove some unused imports 5. silence non ffi-safe warning
starcoinorg · Apr 2, 2024 · 60df70e · 60df70e
1 parent 216781c
commit 60df70e
Show file tree

Hide file tree

Showing 113 changed files with 303 additions and 328 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -1,7 +1,7 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true }
 rand = { workspace = true }

diff --git a/account/api/Cargo.toml b/account/api/Cargo.toml
@@ -1,13 +1,13 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
 schemars = { workspace = true }
-serde = { default-features = false, workspace = true }
+serde = { features = ["derive"], workspace = true }
 serde_bytes = { workspace = true }
 serde_json = { workspace = true }
 starcoin-crypto = { workspace = true }

diff --git a/account/api/src/provider.rs b/account/api/src/provider.rs
@@ -6,17 +6,15 @@ use starcoin_types::sign_message::{SignedMessage, SigningMessage};
 use starcoin_types::transaction::{RawUserTransaction, SignedUserTransaction};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Default)]
 pub enum AccountProviderStrategy {
+    #[default]
     RPC,
     Local,
     PrivateKey,
 }
 
-impl Default for AccountProviderStrategy {
-    fn default() -> Self {
-        AccountProviderStrategy::RPC
-    }
-}
+
 pub trait AccountProvider {
     fn create_account(&self, password: String) -> Result<AccountInfo>;
 

diff --git a/account/service/Cargo.toml b/account/service/Cargo.toml
@@ -1,7 +1,7 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 futures = { workspace = true }
 starcoin-account = { workspace = true }
 starcoin-account-api = { features = ["mock"], workspace = true }

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -13,21 +13,21 @@ rust-version = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 criterion = { workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
+starcoin-crypto = { workspace = true }
 forkable-jellyfish-merkle = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
+starcoin-logger = { workspace = true }
 parking_lot = { workspace = true }
 proptest = { workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
 starcoin-account-api = { workspace = true }
-starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-accumulator = { workspace = true }
 starcoin-chain = { workspace = true }
 starcoin-config = { workspace = true }
 starcoin-consensus = { workspace = true }
-starcoin-executor = { package = "starcoin-executor", workspace = true }
+starcoin-executor = { workspace = true }
 starcoin-genesis = { workspace = true }
 network-api = { workspace = true }
 starcoin-service-registry = { workspace = true }

diff --git a/block-relayer/Cargo.toml b/block-relayer/Cargo.toml
@@ -1,23 +1,23 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
+bcs-ext = { workspace = true }
+starcoin-crypto = { workspace = true }
 futures = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
-network-api = { package = "network-api", workspace = true }
+starcoin-logger = { workspace = true }
+network-api = { workspace = true }
 starcoin-chain = { workspace = true }
 starcoin-chain-api = { workspace = true }
 starcoin-metrics = { workspace = true }
 starcoin-network = { workspace = true }
 starcoin-network-rpc-api = { workspace = true }
 starcoin-service-registry = { workspace = true }
-starcoin-sync = { package = "starcoin-sync", workspace = true }
-starcoin-sync-api = { package = "starcoin-sync-api", workspace = true }
+starcoin-sync = { workspace = true }
+starcoin-sync-api = { workspace = true }
 starcoin-time-service = { workspace = true }
 starcoin-txpool = { workspace = true }
 starcoin-txpool-api = { workspace = true }
-starcoin-types = { package = "starcoin-types", workspace = true }
+starcoin-types = { workspace = true }
 starcoin-config = { workspace = true }
 
 [dev-dependencies]

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -1,25 +1,25 @@
 [dependencies]
 anyhow = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 clap = { features = ["derive"], workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
-proptest = { default-features = false, optional = true, workspace = true }
-proptest-derive = { default-features = false, optional = true, workspace = true }
+starcoin-crypto = { workspace = true }
+starcoin-logger = { workspace = true }
+proptest = { features = ["std"], optional = true, workspace = true }
+proptest-derive = { optional = true, workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
 sp-utils = { workspace = true }
-starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-accumulator = { workspace = true }
 starcoin-consensus = { workspace = true }
 starcoin-chain-api = { workspace = true }
 starcoin-config = { workspace = true }
-starcoin-executor = { package = "starcoin-executor", workspace = true }
+starcoin-executor = { workspace = true }
 starcoin-open-block = { workspace = true }
 starcoin-service-registry = { workspace = true }
 starcoin-state-api = { workspace = true }
 starcoin-statedb = { workspace = true }
 starcoin-time-service = { workspace = true }
-starcoin-types = { package = "starcoin-types", workspace = true }
+starcoin-types = { workspace = true }
 starcoin-vm-types = { workspace = true }
 starcoin-storage = { workspace = true }
 thiserror = { workspace = true }
@@ -34,9 +34,7 @@ starcoin-chain-mock = { workspace = true }
 starcoin-genesis = { workspace = true }
 starcoin-resource-viewer = { workspace = true }
 starcoin-transaction-builder = { workspace = true }
-starcoin-types = { package = "starcoin-types", features = [
-    "fuzzing",
-], workspace = true }
+starcoin-types = { features = [ "fuzzing" ], workspace = true }
 stdlib = { workspace = true }
 stest = { workspace = true }
 test-helper = { workspace = true }

diff --git a/chain/api/Cargo.toml b/chain/api/Cargo.toml
@@ -2,10 +2,10 @@
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
-network-api = { package = "network-api", workspace = true }
+network-api = { workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
-serde = { default-features = false, workspace = true }
+serde = { features = ["derive"], workspace = true }
 starcoin-accumulator = { workspace = true }
 starcoin-crypto = { workspace = true }
 starcoin-service-registry = { workspace = true }

diff --git a/chain/api/src/lib.rs b/chain/api/src/lib.rs
@@ -1,6 +1,6 @@
 // Copyright (c) The Starcoin Core Contributors
 // SPDX-License-Identifier: Apache-2
-#![deny(clippy::integer_arithmetic)]
+#![deny(clippy::arithmetic_side_effects)]
 
 use anyhow::{bail, format_err, Result};
 use serde::{Deserialize, Serialize};

diff --git a/chain/mock/Cargo.toml b/chain/mock/Cargo.toml
@@ -1,26 +1,26 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
+bcs-ext = { workspace = true }
+starcoin-crypto = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
+starcoin-logger = { workspace = true }
 parking_lot = { workspace = true }
-proptest = { default-features = false, optional = true, workspace = true }
-proptest-derive = { default-features = false, optional = true, workspace = true }
+proptest = { features = ["std"], optional = true, workspace = true }
+proptest-derive = { optional = true, workspace = true }
 starcoin-account-api = { workspace = true }
-starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-accumulator = { workspace = true }
 starcoin-chain = { workspace = true }
 starcoin-config = { workspace = true }
 starcoin-consensus = { workspace = true }
-starcoin-executor = { package = "starcoin-executor", workspace = true }
+starcoin-executor = { workspace = true }
 starcoin-genesis = { workspace = true }
 starcoin-open-block = { workspace = true }
 starcoin-state-api = { workspace = true }
 starcoin-statedb = { workspace = true }
 starcoin-storage = { workspace = true }
-starcoin-types = { package = "starcoin-types", workspace = true }
+starcoin-types = { workspace = true }
 starcoin-vm-types = { workspace = true }
 thiserror = { workspace = true }
 

diff --git a/chain/open-block/Cargo.toml b/chain/open-block/Cargo.toml
@@ -1,14 +1,14 @@
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
+bcs-ext = { workspace = true }
+starcoin-crypto = { workspace = true }
 futures = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
+starcoin-logger = { workspace = true }
 parking_lot = { workspace = true }
-starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-accumulator = { workspace = true }
 starcoin-chain-api = { workspace = true }
-starcoin-executor = { package = "starcoin-executor", workspace = true }
+starcoin-executor = { workspace = true }
 starcoin-state-api = { workspace = true }
 starcoin-statedb = { workspace = true }
 starcoin-storage = { workspace = true }

diff --git a/chain/service/Cargo.toml b/chain/service/Cargo.toml
@@ -4,7 +4,7 @@ async-trait = { workspace = true }
 futures = { workspace = true }
 rand = { workspace = true }
 rand_core = { default-features = false, workspace = true }
-serde = { default-features = false, workspace = true }
+serde = { features = ["derive"], workspace = true }
 starcoin-chain = { workspace = true }
 starcoin-chain-api = { workspace = true }
 starcoin-config = { workspace = true }

diff --git a/chain/src/chain.rs b/chain/src/chain.rs
@@ -982,7 +982,9 @@ impl BlockChain {
             .map(|status| status.total_difficulty())
             .unwrap_or_default();
 
-        let total_difficulty = pre_total_difficulty + header.difficulty();
+        let total_difficulty = pre_total_difficulty
+            .checked_add(header.difficulty())
+            .ok_or(format_err!("failed to calculate total difficulty"))?;
 
         block_accumulator.append(&[block_id])?;
         block_accumulator.flush()?;

diff --git a/chain/src/lib.rs b/chain/src/lib.rs
@@ -1,6 +1,6 @@
 // Copyright (c) The Starcoin Core Contributors
 // SPDX-License-Identifier: Apache-2.0
-#![deny(clippy::integer_arithmetic)]
+#![deny(clippy::arithmetic_side_effects)]
 mod chain;
 pub mod verifier;
 pub use chain::BlockChain;

diff --git a/cmd/airdrop/src/main.rs b/cmd/airdrop/src/main.rs
@@ -226,7 +226,7 @@ async fn main() -> Result<()> {
             .map(|r| r.sequence_number())
             .unwrap_or_default()
     };
-    for (i, airdrops) in airdrop_infos.chunks(batch_size).into_iter().enumerate() {
+    for (i, airdrops) in airdrop_infos.chunks(batch_size).enumerate() {
         let addresses = MoveValue::Vector(
             airdrops
                 .iter()

diff --git a/cmd/db-exporter/Cargo.toml b/cmd/db-exporter/Cargo.toml
@@ -5,19 +5,19 @@ path = "src/main.rs"
 [dependencies]
 anyhow = { workspace = true }
 atomic-counter = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 csv = { workspace = true }
 hex = { workspace = true }
 indicatif = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
+starcoin-logger = { workspace = true }
 serde = { workspace = true }
 serde_json = { features = ["arbitrary_precision"], workspace = true }
 tokio = { features = ["full"], workspace = true }
 move-binary-format = { workspace = true }
 move-bytecode-verifier = { workspace = true }
 starcoin-account-api = { workspace = true }
-starcoin-accumulator = { package = "starcoin-accumulator", workspace = true }
+starcoin-accumulator = { workspace = true }
 starcoin-chain = { workspace = true }
 starcoin-config = { workspace = true }
 starcoin-consensus = { workspace = true }

diff --git a/cmd/faucet/Cargo.toml b/cmd/faucet/Cargo.toml
@@ -8,7 +8,7 @@ ascii = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-hex = { default-features = false, workspace = true }
+hex = { features = ["serde"], workspace = true }
 once_cell = { workspace = true }
 rust-embed = { workspace = true }
 serde = { workspace = true }

diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml
@@ -7,7 +7,7 @@ anyhow = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-hex = { default-features = false, workspace = true }
+hex = { features = ["serde"], workspace = true }
 scmd = { workspace = true }
 serde = { workspace = true }
 serde_json = { features = ["arbitrary_precision"], workspace = true }

diff --git a/cmd/merkle-generator/Cargo.toml b/cmd/merkle-generator/Cargo.toml
@@ -1,6 +1,6 @@
 [dependencies]
 anyhow = { workspace = true }
-bcs-ext = { package = "bcs-ext", workspace = true }
+bcs-ext = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 csv = { workspace = true }
 hex = { workspace = true }

diff --git a/cmd/miner_client/Cargo.toml b/cmd/miner_client/Cargo.toml
@@ -7,14 +7,14 @@ actix = { workspace = true }
 actix-rt = { workspace = true }
 anyhow = { workspace = true }
 async-std = { workspace = true }
-starcoin-consensus = { package = "starcoin-consensus", workspace = true }
-starcoin-crypto = { package = "starcoin-crypto", workspace = true }
+starcoin-consensus = { workspace = true }
+starcoin-crypto = { workspace = true }
 futures = { workspace = true }
 futures-channel = { workspace = true }
 jsonrpc-core = { features = ["arbitrary_precision"], workspace = true }
 jsonrpc-core-client = { workspace = true }
 jsonrpc-server-utils = { workspace = true }
-starcoin-logger = { package = "starcoin-logger", workspace = true }
+starcoin-logger = { workspace = true }
 starcoin-config = { workspace = true }
 starcoin-time-service = { workspace = true }
 starcoin-types = { workspace = true }
@@ -24,7 +24,7 @@ byteorder = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 dyn-clone = { workspace = true }
 futures-timer = { workspace = true }
-hex = { default-features = false, workspace = true }
+hex = { features = ["serde"], workspace = true }
 libloading = { workspace = true }
 parking_lot = { workspace = true }
 rand = { workspace = true }