fix: self update is now pointing to the right archive name (near#234)

* fix: archive name * fix: cargo clipped * style: fmt
AlexKushnir1 · Sep 1, 2023 · f473269 · f473269
1 parent 23bb067
commit f473269
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,7 @@ shell-words = "1"
 cargo-util = "0.1.1"
 
 semver = { version = "1.0.4", optional = true }
-self_update = { version = "0.36.0", features = ["archive-tar", "compression-flate2"], optional = true }
+self_update = { version = "0.37.0", features = ["archive-tar", "compression-flate2"], optional = true }
 
 color-eyre = "0.6"
 thiserror = "1"

diff --git a/src/commands/contract/download_wasm/mod.rs b/src/commands/contract/download_wasm/mod.rs
@@ -76,7 +76,7 @@ impl DownloadContractContext {
                     .blocking_call(near_jsonrpc_client::methods::query::RpcQueryRequest {
                         block_reference: block_reference.clone(),
                         request: near_primitives::views::QueryRequest::ViewCode {
-                            account_id: account_id.clone().into(),
+                            account_id: account_id.clone(),
                         },
                     })
                     .wrap_err_with(|| format!("Failed to fetch query ViewCode for <{}>", &account_id))?;

diff --git a/src/commands/extensions/self_update/mod.rs b/src/commands/extensions/self_update/mod.rs
@@ -22,13 +22,7 @@ impl SelfUpdateCommandContext {
             .repo_owner("near")
             .repo_name("near-cli-rs")
             .bin_path_in_archive(
-                format!(
-                    "near-cli-rs-v{}-{}/{}",
-                    get_latest_version()?,
-                    self_update::get_target(),
-                    BIN_NAME
-                )
-                .as_str(),
+                format!("near-cli-rs-{}/{}", self_update::get_target(), BIN_NAME).as_str(),
             )
             .bin_name(BIN_NAME)
             .show_download_progress(true)

diff --git a/src/commands/tokens/send_ft/mod.rs b/src/commands/tokens/send_ft/mod.rs
@@ -66,8 +66,8 @@ impl From<SendFtCommandContext> for crate::commands::ActionContext {
 
                 move |_network_config| {
                     Ok(crate::commands::PrepopulatedTransaction {
-                        signer_id: signer_account_id.clone().into(),
-                        receiver_id: ft_contract_account_id.clone().into(),
+                        signer_id: signer_account_id.clone(),
+                        receiver_id: ft_contract_account_id.clone(),
                         actions: vec![near_primitives::transaction::Action::FunctionCall(
                             near_primitives::transaction::FunctionCallAction {
                                 method_name: "ft_transfer".to_string(),

diff --git a/src/commands/transaction/sign_transaction/mod.rs b/src/commands/transaction/sign_transaction/mod.rs
@@ -34,8 +34,8 @@ impl SignTransactionContext {
         Ok(Self(crate::commands::ActionContext {
             global_context: previous_context,
             interacting_with_account_ids: vec![
-                scope.unsigned_transaction.inner.signer_id.clone().into(),
-                scope.unsigned_transaction.inner.receiver_id.clone().into(),
+                scope.unsigned_transaction.inner.signer_id.clone(),
+                scope.unsigned_transaction.inner.receiver_id.clone(),
             ],
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(

diff --git a/src/commands/transaction/view_status/mod.rs b/src/commands/transaction/view_status/mod.rs
@@ -27,7 +27,7 @@ impl TransactionInfoContext {
         let on_after_getting_network_callback: crate::network::OnAfterGettingNetworkCallback =
             std::sync::Arc::new({
                 let signer_account_id = scope.signer_account_id.clone();
-                let transaction_hash = scope.transaction_hash.clone();
+                let transaction_hash = scope.transaction_hash;
 
                 move |network_config| {
                     let query_view_transaction_status = network_config