Fix rustc 1.77 issues and lints (kaspanet#442)

* remove BorshSchema due to rustc 1.77 issues * fix seal macro hash error due to rustc 1.77 * fix all rustc 1.77 lints * add MSRV to `Cargo.toml` * suppress lints instead of making fields public * propagate `package.rust-version` to all workspace crates
gvbgduh · Mar 26, 2024 · 6fd7029 · 6fd7029
1 parent d7ecfa2
commit 6fd7029
Show file tree

Hide file tree

Showing 87 changed files with 309 additions and 255 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,6 +57,7 @@ members = [
 ]
 
 [workspace.package]
+rust-version = "1.77.0"
 version = "0.13.5"
 authors = ["Kaspa developers"]
 license = "MIT/Apache-2.0"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -2,6 +2,7 @@
 name = "kaspa-cli"
 description = "Kaspa CLI"
 keywords = ["kaspa", "wallet", "cli", "rpc"]
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/components/addressmanager/Cargo.toml b/components/addressmanager/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-addressmanager"
 description = "Kaspa address manager"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/components/connectionmanager/Cargo.toml b/components/connectionmanager/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-connectionmanager"
 description = "Kaspa connection manager"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/components/consensusmanager/Cargo.toml b/components/consensusmanager/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-consensusmanager"
 description = "Kaspa consensus library"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/components/consensusmanager/src/session.rs b/components/consensusmanager/src/session.rs
@@ -22,9 +22,11 @@ pub use tokio::task::spawn_blocking;
 
 use crate::BlockProcessingBatch;
 
+#[allow(dead_code)]
 #[derive(Clone)]
 pub struct SessionOwnedReadGuard(Arc<RfRwLockOwnedReadGuard>);
 
+#[allow(dead_code)]
 pub struct SessionReadGuard<'a>(RfRwLockReadGuard<'a>);
 
 pub struct SessionWriteGuard<'a>(RfRwLockWriteGuard<'a>);

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-consensus"
 description = "Kaspa consensus library"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/consensus/core/Cargo.toml b/consensus/core/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-consensus-core"
 description = "Kaspa consensus core"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/consensus/core/src/api/stats.rs b/consensus/core/src/api/stats.rs
@@ -1,7 +1,7 @@
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, BorshSchema, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct BlockCount {
     pub header_count: u64,

diff --git a/consensus/core/src/header.rs b/consensus/core/src/header.rs
@@ -1,5 +1,5 @@
 use crate::{hashing, BlueWorkType};
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use js_sys::{Array, Object};
 use kaspa_hashes::Hash;
 use kaspa_utils::hex::ToHex;
@@ -8,7 +8,7 @@ use serde_wasm_bindgen::*;
 use wasm_bindgen::prelude::*;
 use workflow_wasm::prelude::*;
 
-#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Clone, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[serde(rename_all = "camelCase")]
 #[wasm_bindgen(inspectable)]
 pub struct Header {

diff --git a/consensus/core/src/network.rs b/consensus/core/src/network.rs
@@ -1,4 +1,4 @@
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use kaspa_addresses::Prefix;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt::{Debug, Display, Formatter};
@@ -15,7 +15,7 @@ pub enum NetworkTypeError {
 }
 
 u8_try_from! {
-    #[derive(Clone, Copy, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, BorshSchema, PartialEq, Eq)]
+    #[derive(Clone, Copy, Debug, Serialize, Deserialize, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
     #[serde(rename_all = "lowercase")]
     #[wasm_bindgen]
     pub enum NetworkType {
@@ -157,7 +157,7 @@ pub enum NetworkIdError {
     InvalidNetworkId(String),
 }
 
-#[derive(Clone, Copy, Debug, BorshSerialize, BorshDeserialize, BorshSchema, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, BorshSerialize, BorshDeserialize, PartialEq, Eq)]
 #[wasm_bindgen(inspectable)]
 pub struct NetworkId {
     #[wasm_bindgen(js_name = "type")]

diff --git a/consensus/core/src/subnets.rs b/consensus/core/src/subnets.rs
@@ -1,15 +1,15 @@
 use std::fmt::{Debug, Display, Formatter};
 use std::str::{self, FromStr};
 
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use kaspa_utils::hex::{FromHex, ToHex};
 use kaspa_utils::{serde_impl_deser_fixed_bytes_ref, serde_impl_ser_fixed_bytes_ref};
 
 /// The size of the array used to store subnetwork IDs.
 pub const SUBNETWORK_ID_SIZE: usize = 20;
 
 /// The domain representation of a Subnetwork ID
-#[derive(Clone, Default, Eq, PartialEq, Ord, PartialOrd, Hash, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Clone, Default, Eq, PartialEq, Ord, PartialOrd, Hash, BorshSerialize, BorshDeserialize)]
 pub struct SubnetworkId([u8; SUBNETWORK_ID_SIZE]);
 
 impl Debug for SubnetworkId {

diff --git a/consensus/core/src/tx.rs b/consensus/core/src/tx.rs
@@ -1,6 +1,6 @@
 mod script_public_key;
 
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use kaspa_utils::hex::ToHex;
 use kaspa_utils::mem_size::MemSizeEstimator;
 use kaspa_utils::{serde_bytes, serde_bytes_fixed_ref};
@@ -28,7 +28,7 @@ pub type TransactionId = kaspa_hashes::Hash;
 /// set such as whether or not it was contained in a coinbase tx, the daa
 /// score of the block that accepts the tx, its public key script, and how
 /// much it pays.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[serde(rename_all = "camelCase")]
 #[wasm_bindgen(inspectable, js_name = TxUtxoEntry)]
 pub struct UtxoEntry {
@@ -52,7 +52,7 @@ impl MemSizeEstimator for UtxoEntry {}
 pub type TransactionIndexType = u32;
 
 /// Represents a Kaspa transaction outpoint
-#[derive(Eq, Hash, PartialEq, Debug, Copy, Clone, Serialize, Deserialize, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Eq, Hash, PartialEq, Debug, Copy, Clone, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionOutpoint {
     #[serde(with = "serde_bytes_fixed_ref")]
@@ -73,7 +73,7 @@ impl Display for TransactionOutpoint {
 }
 
 /// Represents a Kaspa transaction input
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionInput {
     pub previous_outpoint: TransactionOutpoint,
@@ -105,7 +105,7 @@ impl std::fmt::Debug for TransactionInput {
 }
 
 /// Represents a Kaspad transaction output
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize, BorshSchema)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, BorshSerialize, BorshDeserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionOutput {
     pub value: u64,

diff --git a/consensus/core/src/tx/script_public_key.rs b/consensus/core/src/tx/script_public_key.rs
@@ -1,5 +1,5 @@
 use alloc::borrow::Cow;
-use borsh::{BorshDeserialize, BorshSchema, BorshSerialize};
+use borsh::{BorshDeserialize, BorshSerialize};
 use core::fmt::Formatter;
 use kaspa_utils::{
     hex::{FromHex, ToHex},
@@ -350,26 +350,6 @@ impl BorshDeserialize for ScriptPublicKey {
     }
 }
 
-impl BorshSchema for ScriptPublicKey {
-    fn add_definitions_recursively(
-        definitions: &mut std::collections::HashMap<borsh::schema::Declaration, borsh::schema::Definition>,
-    ) {
-        let fields = borsh::schema::Fields::NamedFields(std::vec![
-            ("version".to_string(), <u16>::declaration()),
-            ("script".to_string(), <Vec<u8>>::declaration())
-        ]);
-        let definition = borsh::schema::Definition::Struct { fields };
-        Self::add_definition(Self::declaration(), definition, definitions);
-        <u16>::add_definitions_recursively(definitions);
-        // `<Vec<u8>>` can be safely used as scheme definition for smallvec. See comments above.
-        <Vec<u8>>::add_definitions_recursively(definitions);
-    }
-
-    fn declaration() -> borsh::schema::Declaration {
-        "ScriptPublicKey".to_string()
-    }
-}
-
 impl TryFrom<JsValue> for ScriptPublicKey {
     type Error = JsValue;
 

diff --git a/consensus/notify/Cargo.toml b/consensus/notify/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-consensus-notify"
 description = "Kaspa consensus notifier"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/consensus/pow/Cargo.toml b/consensus/pow/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-pow"
 description = "Kaspa proof-of-work"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/consensus/wasm/Cargo.toml b/consensus/wasm/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-consensus-wasm"
 description = "Kaspa consensus core WASM bindings"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-core"
 description = "Kaspa core"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/crypto/addresses/Cargo.toml b/crypto/addresses/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "kaspa-addresses"
 description = "Kaspa address"
+rust-version.workspace = true
 version.workspace = true
 edition.workspace = true
 authors.workspace = true