Change directory back to repo root & Fix Rust v1.81 lints (#545)

saefstroem · biryukovmaxim · michaelsutton · web-flow · commit afbcf9e473ac · 2024-09-06T06:40:53.000+03:00
* Change directory back to repodir

Change directory back to repodir after building toolchain

* Clippy

* Update crypto/txscript/src/caches.rs

Co-authored-by: Maxim &lt;59533214+biryukovmaxim@users.noreply.github.com&gt;

* Update crypto/txscript/src/caches.rs

* rename `is_none_or` -&gt; `is_none_or_ex` to avoid conflict with future std

* remove `use std::mem::size_of` wherever possible (added to std prelude recently)

---------

Co-authored-by: Maxim &lt;59533214+biryukovmaxim@users.noreply.github.com&gt;
Co-authored-by: Michael Sutton &lt;msutton@cs.huji.ac.il&gt;
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -55,7 +55,10 @@ jobs:
         run: |
           # Run build script for musl toolchain
           source musl-toolchain/build.sh
-
+          
+          # Go back to the workspace
+          cd $GITHUB_WORKSPACE
+          
           # Build for musl
           cargo --verbose build --bin kaspad --bin rothschild --bin kaspa-wallet --release --target x86_64-unknown-linux-musl
           mkdir bin || true
diff --git a/consensus/core/src/utxo/utxo_diff.rs b/consensus/core/src/utxo/utxo_diff.rs
@@ -5,7 +5,7 @@ use super::{
 use crate::tx::{TransactionOutpoint, UtxoEntry, VerifiableTransaction};
 use kaspa_utils::mem_size::MemSizeEstimator;
 use serde::{Deserialize, Serialize};
-use std::{collections::hash_map::Entry::Vacant, mem::size_of};
+use std::collections::hash_map::Entry::Vacant;
 
 pub trait ImmutableUtxoDiff {
     fn added(&self) -> &UtxoCollection;
diff --git a/consensus/src/consensus/storage.rs b/consensus/src/consensus/storage.rs
@@ -31,7 +31,7 @@ use kaspa_consensus_core::{blockstatus::BlockStatus, BlockHashSet};
 use kaspa_database::registry::DatabaseStorePrefixes;
 use kaspa_hashes::Hash;
 use parking_lot::RwLock;
-use std::{mem::size_of, ops::DerefMut, sync::Arc};
+use std::{ops::DerefMut, sync::Arc};
 
 pub struct ConsensusStorage {
     // DB
diff --git a/consensus/src/model/stores/acceptance_data.rs b/consensus/src/model/stores/acceptance_data.rs
@@ -12,7 +12,6 @@ use kaspa_utils::mem_size::MemSizeEstimator;
 use rocksdb::WriteBatch;
 use serde::Deserialize;
 use serde::Serialize;
-use std::mem::size_of;
 use std::sync::Arc;
 
 pub trait AcceptanceDataStoreReader {
diff --git a/consensus/src/model/stores/block_transactions.rs b/consensus/src/model/stores/block_transactions.rs
@@ -9,7 +9,6 @@ use kaspa_hashes::Hash;
 use kaspa_utils::mem_size::MemSizeEstimator;
 use rocksdb::WriteBatch;
 use serde::{Deserialize, Serialize};
-use std::mem::size_of;
 use std::sync::Arc;
 
 pub trait BlockTransactionsStoreReader {
diff --git a/consensus/src/model/stores/ghostdag.rs b/consensus/src/model/stores/ghostdag.rs
@@ -14,7 +14,6 @@ use kaspa_utils::mem_size::MemSizeEstimator;
 use rocksdb::WriteBatch;
 use serde::{Deserialize, Serialize};
 use std::iter::once;
-use std::mem::size_of;
 use std::{cell::RefCell, sync::Arc};
 
 /// Re-export for convenience
diff --git a/consensus/src/model/stores/headers.rs b/consensus/src/model/stores/headers.rs
@@ -1,4 +1,3 @@
-use std::mem::size_of;
 use std::sync::Arc;
 
 use kaspa_consensus_core::{header::Header, BlockHasher, BlockLevel};
diff --git a/consensus/src/model/stores/mod.rs b/consensus/src/model/stores/mod.rs
@@ -3,10 +3,6 @@ pub mod block_transactions;
 pub mod block_window_cache;
 pub mod children;
 pub mod daa;
-pub mod selected_chain;
-use std::{fmt::Display, mem::size_of};
-
-pub use kaspa_database;
 pub mod depth;
 pub mod ghostdag;
 pub mod headers;
@@ -16,14 +12,17 @@ pub mod pruning;
 pub mod pruning_utxoset;
 pub mod reachability;
 pub mod relations;
+pub mod selected_chain;
 pub mod statuses;
 pub mod tips;
 pub mod utxo_diffs;
 pub mod utxo_multisets;
 pub mod utxo_set;
 pub mod virtual_state;
 
+pub use kaspa_database;
 pub use kaspa_database::prelude::DB;
+use std::fmt::Display;
 
 #[derive(PartialEq, Eq, Clone, Copy, Hash)]
 pub(crate) struct U64Key([u8; size_of::<u64>()]);
diff --git a/consensus/src/model/stores/utxo_set.rs b/consensus/src/model/stores/utxo_set.rs
@@ -28,7 +28,7 @@ pub trait UtxoSetStore: UtxoSetStoreReader {
     fn write_many(&mut self, utxos: &[(TransactionOutpoint, UtxoEntry)]) -> Result<(), StoreError>;
 }
 
-pub const UTXO_KEY_SIZE: usize = kaspa_hashes::HASH_SIZE + std::mem::size_of::<TransactionIndexType>();
+pub const UTXO_KEY_SIZE: usize = kaspa_hashes::HASH_SIZE + size_of::<TransactionIndexType>();
 
 #[derive(Eq, Hash, PartialEq, Debug, Copy, Clone)]
 struct UtxoKey([u8; UTXO_KEY_SIZE]);
@@ -81,8 +81,7 @@ impl From<UtxoKey> for TransactionOutpoint {
     fn from(k: UtxoKey) -> Self {
         let transaction_id = Hash::from_slice(&k.0[..kaspa_hashes::HASH_SIZE]);
         let index = TransactionIndexType::from_le_bytes(
-            <[u8; std::mem::size_of::<TransactionIndexType>()]>::try_from(&k.0[kaspa_hashes::HASH_SIZE..])
-                .expect("expecting index size"),
+            <[u8; size_of::<TransactionIndexType>()]>::try_from(&k.0[kaspa_hashes::HASH_SIZE..]).expect("expecting index size"),
         );
         Self::new(transaction_id, index)
     }
diff --git a/consensus/src/pipeline/body_processor/body_validation_in_context.rs b/consensus/src/pipeline/body_processor/body_validation_in_context.rs
@@ -37,7 +37,7 @@ impl BlockBodyProcessor {
             .copied()
             .filter(|parent| {
                 let status_option = statuses_read_guard.get(*parent).unwrap_option();
-                status_option.is_none_or(|s| !s.has_block_body())
+                status_option.is_none_or_ex(|s| !s.has_block_body())
             })
             .collect();
         if !missing.is_empty() {
diff --git a/consensus/src/processes/coinbase.rs b/consensus/src/processes/coinbase.rs
@@ -5,7 +5,7 @@ use kaspa_consensus_core::{
     tx::{ScriptPublicKey, ScriptVec, Transaction, TransactionOutput},
     BlockHashMap, BlockHashSet,
 };
-use std::{convert::TryInto, mem::size_of};
+use std::convert::TryInto;
 
 use crate::{constants, model::stores::ghostdag::GhostdagData};
 
diff --git a/consensus/src/processes/pruning.rs b/consensus/src/processes/pruning.rs
@@ -213,7 +213,7 @@ impl<
         let mut expected_pps_queue = VecDeque::new();
         for current in self.reachability_service.backward_chain_iterator(hst, pruning_info.pruning_point, false) {
             let current_header = self.headers_store.get_header(current).unwrap();
-            if expected_pps_queue.back().is_none_or(|&&h| h != current_header.pruning_point) {
+            if expected_pps_queue.back().is_none_or_ex(|&&h| h != current_header.pruning_point) {
                 expected_pps_queue.push_back(current_header.pruning_point);
             }
         }
diff --git a/consensus/src/processes/sync/mod.rs b/consensus/src/processes/sync/mod.rs
@@ -191,7 +191,7 @@ impl<
             }
         }
 
-        if highest_with_body.is_none_or(|&h| h == high) {
+        if highest_with_body.is_none_or_ex(|&h| h == high) {
             return Ok(vec![]);
         };
 
diff --git a/crypto/muhash/fuzz/fuzz_targets/u3072.rs b/crypto/muhash/fuzz/fuzz_targets/u3072.rs
@@ -4,7 +4,6 @@ use kaspa_muhash::u3072::{self, U3072};
 use num_bigint::BigInt;
 use num_integer::Integer;
 use num_traits::{One, Signed};
-use std::mem::size_of;
 
 fuzz_target!(|data: &[u8]| {
     if data.len() < muhash::SERIALIZED_MUHASH_SIZE {
diff --git a/crypto/muhash/src/u3072.rs b/crypto/muhash/src/u3072.rs
@@ -15,8 +15,8 @@ pub(crate) type DoubleLimb = u128;
 //#[cfg(target_pointer_width = "32")]
 //pub(crate) type DoubleLimb = u64;
 
-const LIMB_SIZE_BYTES: usize = std::mem::size_of::<Limb>();
-const LIMB_SIZE: usize = std::mem::size_of::<Limb>() * 8;
+const LIMB_SIZE_BYTES: usize = size_of::<Limb>();
+const LIMB_SIZE: usize = Limb::BITS as usize;
 pub const LIMBS: usize = crate::ELEMENT_BYTE_SIZE / LIMB_SIZE_BYTES;
 
 pub const PRIME_DIFF: Limb = 1103717;
diff --git a/crypto/txscript/src/caches.rs b/crypto/txscript/src/caches.rs
@@ -32,9 +32,8 @@ impl<TKey: Clone + std::hash::Hash + Eq + Send + Sync, TData: Clone + Send + Syn
     }
 
     pub(crate) fn get(&self, key: &TKey) -> Option<TData> {
-        self.map.read().get(key).cloned().map(|data| {
+        self.map.read().get(key).cloned().inspect(|_data| {
             self.counters.get_counts.fetch_add(1, Ordering::Relaxed);
-            data
         })
     }
 
diff --git a/crypto/txscript/src/data_stack.rs b/crypto/txscript/src/data_stack.rs
@@ -1,7 +1,6 @@
 use crate::TxScriptError;
 use core::fmt::Debug;
 use core::iter;
-use core::mem::size_of;
 
 const DEFAULT_SCRIPT_NUM_LEN: usize = 4;
 
diff --git a/crypto/txscript/src/opcodes/mod.rs b/crypto/txscript/src/opcodes/mod.rs
@@ -1,5 +1,3 @@
-use core::mem::size_of;
-
 #[macro_use]
 mod macros;
 
diff --git a/database/src/registry.rs b/database/src/registry.rs
@@ -95,8 +95,8 @@ mod tests {
         let prefix = DatabaseStorePrefixes::AcceptanceData;
         assert_eq!(&[prefix as u8], prefix.as_ref());
         assert_eq!(
-            std::mem::size_of::<u8>(),
-            std::mem::size_of::<DatabaseStorePrefixes>(),
+            size_of::<u8>(),
+            size_of::<DatabaseStorePrefixes>(),
             "DatabaseStorePrefixes is expected to have the same memory layout of u8"
         );
     }
diff --git a/indexes/utxoindex/src/stores/indexed_utxos.rs b/indexes/utxoindex/src/stores/indexed_utxos.rs
@@ -11,7 +11,6 @@ use kaspa_index_core::indexed_utxos::BalanceByScriptPublicKey;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::fmt::Display;
-use std::mem::size_of;
 use std::sync::Arc;
 
 pub const VERSION_TYPE_SIZE: usize = size_of::<ScriptPublicKeyVersion>(); // Const since we need to re-use this a few times.
@@ -67,8 +66,7 @@ impl From<TransactionOutpointKey> for TransactionOutpoint {
     fn from(key: TransactionOutpointKey) -> Self {
         let transaction_id = Hash::from_slice(&key.0[..kaspa_hashes::HASH_SIZE]);
         let index = TransactionIndexType::from_le_bytes(
-            <[u8; std::mem::size_of::<TransactionIndexType>()]>::try_from(&key.0[kaspa_hashes::HASH_SIZE..])
-                .expect("expected index size"),
+            <[u8; size_of::<TransactionIndexType>()]>::try_from(&key.0[kaspa_hashes::HASH_SIZE..]).expect("expected index size"),
         );
         Self::new(transaction_id, index)
     }
diff --git a/math/src/uint.rs b/math/src/uint.rs
@@ -15,7 +15,7 @@ macro_rules! construct_uint {
             pub const MIN: Self = Self::ZERO;
             pub const MAX: Self = $name([u64::MAX; $n_words]);
             pub const BITS: u32 = $n_words * u64::BITS;
-            pub const BYTES: usize = $n_words * core::mem::size_of::<u64>();
+            pub const BYTES: usize = $n_words * size_of::<u64>();
             pub const LIMBS: usize = $n_words;
 
             #[inline]
diff --git a/mining/src/testutils/coinbase_mock.rs b/mining/src/testutils/coinbase_mock.rs
@@ -4,7 +4,6 @@ use kaspa_consensus_core::{
     subnets::SUBNETWORK_ID_COINBASE,
     tx::{Transaction, TransactionOutput},
 };
-use std::mem::size_of;
 
 const LENGTH_OF_BLUE_SCORE: usize = size_of::<u64>();
 const LENGTH_OF_SUBSIDY: usize = size_of::<u64>();
diff --git a/protocol/flows/src/flowcontext/orphans.rs b/protocol/flows/src/flowcontext/orphans.rs
@@ -166,7 +166,7 @@ impl OrphanBlocksPool {
                 }
             } else {
                 let status = consensus.async_get_block_status(current).await;
-                if status.is_none_or(|s| s.is_header_only()) {
+                if status.is_none_or_ex(|s| s.is_header_only()) {
                     // Block is not in the orphan pool nor does its body exist consensus-wise, so it is a root
                     roots.push(current);
                 }
@@ -193,7 +193,8 @@ impl OrphanBlocksPool {
             if let Occupied(entry) = self.orphans.entry(orphan_hash) {
                 let mut processable = true;
                 for p in entry.get().block.header.direct_parents().iter().copied() {
-                    if !processing.contains_key(&p) && consensus.async_get_block_status(p).await.is_none_or(|s| s.is_header_only()) {
+                    if !processing.contains_key(&p) && consensus.async_get_block_status(p).await.is_none_or_ex(|s| s.is_header_only())
+                    {
                         processable = false;
                         break;
                     }
@@ -249,7 +250,7 @@ impl OrphanBlocksPool {
             let mut processable = true;
             for parent in block.block.header.direct_parents().iter().copied() {
                 if self.orphans.contains_key(&parent)
-                    || consensus.async_get_block_status(parent).await.is_none_or(|status| status.is_header_only())
+                    || consensus.async_get_block_status(parent).await.is_none_or_ex(|status| status.is_header_only())
                 {
                     processable = false;
                     break;
diff --git a/protocol/p2p/src/convert/net_address.rs b/protocol/p2p/src/convert/net_address.rs
@@ -1,7 +1,4 @@
-use std::{
-    mem::size_of,
-    net::{IpAddr, Ipv4Addr, Ipv6Addr},
-};
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
 use super::error::ConversionError;
 use crate::pb as protowire;
diff --git a/utils/src/mem_size.rs b/utils/src/mem_size.rs
@@ -2,7 +2,7 @@
 //! estimate sizes of run-time objects in memory, including deep heap allocations. See
 //! struct-level docs for more details.
 
-use std::{collections::HashSet, mem::size_of, sync::Arc};
+use std::{collections::HashSet, sync::Arc};
 
 use parking_lot::RwLock;
 
diff --git a/utils/src/option.rs b/utils/src/option.rs
@@ -1,9 +1,10 @@
 pub trait OptionExtensions<T> {
-    fn is_none_or(&self, f: impl FnOnce(&T) -> bool) -> bool;
+    /// Substitute for unstable [Option<T>::is_non_or]
+    fn is_none_or_ex(&self, f: impl FnOnce(&T) -> bool) -> bool;
 }
 
 impl<T> OptionExtensions<T> for Option<T> {
-    fn is_none_or(&self, f: impl FnOnce(&T) -> bool) -> bool {
+    fn is_none_or_ex(&self, f: impl FnOnce(&T) -> bool) -> bool {
         match self {
             Some(v) => f(v),
             None => true,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use std::mem::size_of;`
`2`	`1`	`use std::sync::Arc;`
`3`	`2`
`4`	`3`	`use kaspa_consensus_core::{header::Header, BlockHasher, BlockLevel};`