Addressed comments. Make clippy happy

crates/services/consensus_module/poa/src/sync.rs

@@ -131,6 +131,7 @@ impl RunnableService for SyncTask {
 
 #[async_trait::async_trait]
 impl RunnableTask for SyncTask {
+    #[allow(clippy::blocks_in_conditions)]
     #[tracing::instrument(level = "debug", skip_all, err, ret)]
     async fn run(&mut self, watcher: &mut StateWatcher) -> anyhow::Result<bool> {
         let mut should_continue = true;

crates/services/executor/src/executor.rs

@@ -225,7 +225,6 @@ where
 // TODO: Make this module private after moving unit tests from `fuel-core` here.
 pub mod block_component {
     use super::*;
-    use fuel_core_types::fuel_tx::field::MintGasPrice;
 
     pub struct PartialBlockComponent<'a, TxSource> {
         pub empty_block: &'a mut PartialFuelBlock,

crates/services/sync/src/service.rs

@@ -118,6 +118,7 @@ where
     E: BlockImporterPort + Send + Sync + 'static,
     C: ConsensusPort + Send + Sync + 'static,
 {
+    #[allow(clippy::blocks_in_conditions)]
     #[tracing::instrument(level = "debug", skip_all, err, ret)]
     async fn run(&mut self, _: &mut StateWatcher) -> anyhow::Result<bool> {
         Ok(self.sync_heights.sync().await.is_some())
@@ -175,6 +176,7 @@ where
     E: BlockImporterPort + Send + Sync + 'static,
     C: ConsensusPort + Send + Sync + 'static,
 {
+    #[allow(clippy::blocks_in_conditions)]
     #[tracing::instrument(level = "debug", skip_all, err, ret)]
     async fn run(&mut self, watcher: &mut StateWatcher) -> anyhow::Result<bool> {
         self.0.import(watcher).await

crates/services/txpool/src/mock_db.rs

@@ -69,13 +69,7 @@ impl MockDb {
 
 impl TxPoolDb for MockDb {
     fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>> {
-        Ok(self
-            .data
-            .lock()
-            .unwrap()
-            .coins
-            .get(utxo_id)
-            .map(Clone::clone))
+        Ok(self.data.lock().unwrap().coins.get(utxo_id).cloned())
     }
 
     fn contract_exist(&self, contract_id: &ContractId) -> StorageResult<bool> {
@@ -88,7 +82,7 @@ impl TxPoolDb for MockDb {
     }
 
     fn message(&self, id: &Nonce) -> StorageResult<Option<Message>> {
-        Ok(self.data.lock().unwrap().messages.get(id).map(Clone::clone))
+        Ok(self.data.lock().unwrap().messages.get(id).cloned())
     }
 
     fn is_message_spent(&self, id: &Nonce) -> StorageResult<bool> {

crates/services/upgradable-executor/src/executor.rs

@@ -2,7 +2,6 @@ use crate::config::Config;
 use fuel_core_executor::{
     executor::{
         ExecutionBlockWithSource,
-        ExecutionInstance,
         ExecutionOptions,
         OnceTransactionsSource,
     },
@@ -40,7 +39,7 @@ use fuel_core_types::{
 use std::sync::Arc;
 
 /// The upgradable executor supports the WASM version of the state transition function.
-/// If the block allows it, the executor uses a native state transition function.
+/// If the block has a version the same as a native executor, we will use it.
 /// If not, the WASM version of the state transition function will be used
 /// (if the database has a corresponding bytecode).
 pub struct Executor<S, R> {
@@ -254,7 +253,7 @@ where
         instance.run(&self.module)
     }
 
-    #[allow(dead_code)]
+    #[cfg(not(feature = "wasm-executor"))]
     fn native_execute_inner<TxSource>(
         &self,
         block: ExecutionBlockWithSource<TxSource>,
@@ -270,7 +269,7 @@ where
             .take()
             .unwrap_or_else(|| self.config.consensus_parameters.clone());
 
-        let instance = ExecutionInstance {
+        let instance = fuel_core_executor::executor::ExecutionInstance {
             relayer,
             database: storage,
             consensus_params,

crates/services/upgradable-executor/src/instance.rs

@@ -64,7 +64,7 @@ impl<'a> CallerHelper for Caller<'a, ExecutionState> {
 struct ExecutionState {
     /// The memory used by the WASM module.
     memory: Option<Memory>,
-    next_transaction: HashMap<u32, Vec<Vec<u8>>>,
+    next_transactions: HashMap<u32, Vec<Vec<u8>>>,
     relayer_events: HashMap<DaBlockHeight, Value>,
 }
 
@@ -92,7 +92,7 @@ impl Instance {
                 engine,
                 ExecutionState {
                     memory: None,
-                    next_transaction: Default::default(),
+                    next_transactions: Default::default(),
                     relayer_events: Default::default(),
                 },
             ),
@@ -184,7 +184,7 @@ impl Instance<Created> {
 
             caller
                 .data_mut()
-                .next_transaction
+                .next_transactions
                 .entry(encoded_size)
                 .or_default()
                 .push(encoded_txs);
@@ -201,7 +201,7 @@ impl Instance<Created> {
               -> anyhow::Result<()> {
             let encoded = caller
                 .data_mut()
-                .next_transaction
+                .next_transactions
                 .get_mut(&output_size)
                 .and_then(|vector| vector.pop())
                 .unwrap_or_default();

crates/services/upgradable-executor/wasm-executor/Cargo.toml

@@ -23,6 +23,9 @@ fuel-core-storage = { workspace = true, default-features = false }
 fuel-core-types = { workspace = true, default-features = false }
 postcard = { workspace = true }
 
+[dev-dependencies]
+proptest = { workspace = true }
+
 [features]
 default = ["std"]
 std = []

crates/services/upgradable-executor/wasm-executor/src/utils.rs

@@ -41,3 +41,33 @@ pub fn unpack_exists_size_result(val: u64) -> (bool, u32, u16) {
 pub type InputType = ExecutionBlockWithSource<()>;
 
 pub type ReturnType = ExecutorResult<Uncommitted<ExecutionResult, Changes>>;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use proptest::prelude::prop::*;
+
+    proptest::proptest! {
+        #[test]
+        fn can_pack_any_values(exists: bool, size: u32, result: u16) {
+            pack_exists_size_result(exists, size, result);
+        }
+
+        #[test]
+        fn can_unpack_any_values(value: u64) {
+            let _ = unpack_exists_size_result(value);
+        }
+
+
+        #[test]
+        fn unpacks_packed_values(exists: bool, size: u32, result: u16) {
+            let packed = pack_exists_size_result(exists, size, result);
+            let (unpacked_exists, unpacked_size, unpacked_result) =
+                unpack_exists_size_result(packed);
+
+            proptest::prop_assert_eq!(exists, unpacked_exists);
+            proptest::prop_assert_eq!(size, unpacked_size);
+            proptest::prop_assert_eq!(result, unpacked_result);
+        }
+    }
+}

crates/types/src/blockchain/primitives.rs

@@ -20,7 +20,6 @@ use derive_more::{
     UpperHex,
 };
 use secrecy::{
-    zeroize,
     CloneableSecret,
     DebugSecret,
 };