Просмотр исходного кода

contract/deployooor: Clippy lint

parazyd 2 лет назад
Родитель
Сommit
59d7ed09fc

+ 1 - 4
src/contract/deployooor/src/entrypoint.rs

@@ -58,10 +58,7 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
     // Set up a database tree for arbitrary data
     let info_db = match db_lookup(cid, DEPLOY_CONTRACT_INFO_TREE) {
         Ok(v) => v,
-        Err(_) => {
-            let info_db = db_init(cid, DEPLOY_CONTRACT_INFO_TREE)?;
-            info_db
-        }
+        Err(_) => db_init(cid, DEPLOY_CONTRACT_INFO_TREE)?,
     };
 
     // Set up a database to hold the set of locked contracts

+ 27 - 30
src/contract/deployooor/src/entrypoint/deploy_v1.rs

@@ -112,43 +112,40 @@ pub(crate) fn deploy_process_instruction_v1(
             }
         };
 
-        match payload {
-            ExportSection(v) => {
-                for element in v.into_iter_with_offsets() {
-                    let (_, element) = match element {
-                        Ok(v) => v,
-                        Err(e) => {
-                            msg!("[DeployV1] Error: Failed parsing WASM payload: {}", e);
-                            return Err(DeployError::WasmBincodeInvalid.into())
-                        }
-                    };
-
-                    if element.name == "memory" && element.kind == Memory {
-                        found_memory = true;
-                        continue
+        if let ExportSection(v) = payload {
+            for element in v.into_iter_with_offsets() {
+                let (_, element) = match element {
+                    Ok(v) => v,
+                    Err(e) => {
+                        msg!("[DeployV1] Error: Failed parsing WASM payload: {}", e);
+                        return Err(DeployError::WasmBincodeInvalid.into())
                     }
+                };
 
-                    if element.name == "__initialize" && element.kind == Func {
-                        found_initialize = true;
-                        continue
-                    }
+                if element.name == "memory" && element.kind == Memory {
+                    found_memory = true;
+                    continue
+                }
 
-                    if element.name == "__entrypoint" && element.kind == Func {
-                        found_entrypoint = true;
-                        continue
-                    }
+                if element.name == "__initialize" && element.kind == Func {
+                    found_initialize = true;
+                    continue
+                }
 
-                    if element.name == "__update" && element.kind == Func {
-                        found_update = true;
-                        continue
-                    }
+                if element.name == "__entrypoint" && element.kind == Func {
+                    found_entrypoint = true;
+                    continue
+                }
 
-                    if element.name == "__metadata" && element.kind == Func {
-                        found_metadata = true;
-                    }
+                if element.name == "__update" && element.kind == Func {
+                    found_update = true;
+                    continue
+                }
+
+                if element.name == "__metadata" && element.kind == Func {
+                    found_metadata = true;
                 }
             }
-            _ => {}
         }
     }