Add determinism arg to upload TX (#870)

* add determinism arg to upload tx

* apply clippy suggestions

crates/build/src/tests.rs

@@ -109,7 +109,7 @@ fn build_code_only(manifest_path: &ManifestPath) -> Result<()> {
 
     // we specified that debug symbols should be removed
     // original code should have some but the optimized version should have them removed
-    assert!(!has_debug_symbols(&res.dest_wasm.unwrap()));
+    assert!(!has_debug_symbols(res.dest_wasm.unwrap()));
 
     Ok(())
 }
@@ -341,7 +341,7 @@ fn keep_debug_symbols_in_debug_mode(manifest_path: &ManifestPath) -> Result<()>
     let res = super::execute(args).expect("build failed");
 
     // we specified that debug symbols should be kept
-    assert!(has_debug_symbols(&res.dest_wasm.unwrap()));
+    assert!(has_debug_symbols(res.dest_wasm.unwrap()));
 
     Ok(())
 }
@@ -359,7 +359,7 @@ fn keep_debug_symbols_in_release_mode(manifest_path: &ManifestPath) -> Result<()
     let res = super::execute(args).expect("build failed");
 
     // we specified that debug symbols should be kept
-    assert!(has_debug_symbols(&res.dest_wasm.unwrap()));
+    assert!(has_debug_symbols(res.dest_wasm.unwrap()));
 
     Ok(())
 }

crates/build/src/util/tests.rs

@@ -107,7 +107,7 @@ pub fn create_executable(path: &Path, content: &str) -> MockGuard {
         }
         pathes
     };
-    env::set_var("PATH", env::join_paths(&env_paths).unwrap());
+    env::set_var("PATH", env::join_paths(env_paths).unwrap());
     guard
 }
 

crates/cargo-contract/src/cmd/extrinsics/upload.rs

@@ -50,6 +50,8 @@ use subxt::{
     OnlineClient,
 };
 
+use super::runtime_api::api::runtime_types::pallet_contracts::wasm::Determinism;
+
 #[derive(Debug, clap::Args)]
 #[clap(name = "upload", about = "Upload a contract's code")]
 pub struct UploadCommand {
@@ -161,6 +163,7 @@ impl UploadCommand {
             origin: signer.account_id().clone(),
             code,
             storage_deposit_limit,
+            determinism: Determinism::Deterministic,
         };
         state_call(&url, "ContractsApi_upload_code", call_request).await
     }
@@ -175,9 +178,11 @@ impl UploadCommand {
         let token_metadata = TokenMetadata::query(client).await?;
         let storage_deposit_limit =
             self.extrinsic_opts.storage_deposit_limit(&token_metadata)?;
-        let call = super::runtime_api::api::tx()
-            .contracts()
-            .upload_code(code, storage_deposit_limit);
+        let call = super::runtime_api::api::tx().contracts().upload_code(
+            code,
+            storage_deposit_limit,
+            Determinism::Deterministic,
+        );
 
         let result = submit_extrinsic(client, &call, signer).await?;
         let display_events =
@@ -202,6 +207,7 @@ pub struct CodeUploadRequest {
     origin: <DefaultConfig as Config>::AccountId,
     code: Vec<u8>,
     storage_deposit_limit: Option<Balance>,
+    determinism: Determinism,
 }
 
 #[derive(serde::Serialize)]

crates/cargo-contract/tests/decode.rs

@@ -69,7 +69,7 @@ fn decode_works() {
     let project_dir = tmp_dir.path().to_path_buf().join("switcher");
 
     let lib = project_dir.join("lib.rs");
-    std::fs::write(&lib, contract).expect("Failed to write contract lib.rs");
+    std::fs::write(lib, contract).expect("Failed to write contract lib.rs");
 
     tracing::debug!("Building contract in {}", project_dir.to_string_lossy());
     cargo_contract(&project_dir).arg("build").assert().success();

crates/transcode/src/decode.rs

@@ -92,7 +92,7 @@ impl<'a> Decoder<'a> {
         })?;
 
         let mut elems = Vec::new();
-        while elems.len() < len as usize {
+        while elems.len() < len {
             let elem = self.decode_type(type_id, ty, input)?;
             elems.push(elem)
         }