clippy

integritee-network · Nov 30, 2024 · 04f9d7c · 04f9d7c
1 parent 9696554
commit 04f9d7c
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 31 deletions.
diff --git a/cli/src/guess_the_number/commands/guess.rs b/cli/src/guess_the_number/commands/guess.rs
@@ -25,7 +25,7 @@ use crate::{
 
 use crate::trusted_operation::send_direct_request;
 use ita_stf::{
-	guess_the_number::GuessTheNumberTrustedCall, Getter, Index, TrustedCall, TrustedCallSigned,
+	guess_the_number::GuessTheNumberTrustedCall, Getter, TrustedCall, TrustedCallSigned,
 };
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,

diff --git a/cli/src/guess_the_number/commands/push_by_one_day.rs b/cli/src/guess_the_number/commands/push_by_one_day.rs
@@ -25,7 +25,7 @@ use crate::{
 
 use crate::trusted_operation::send_direct_request;
 use ita_stf::{
-	guess_the_number::GuessTheNumberTrustedCall, Getter, Index, TrustedCall, TrustedCallSigned,
+	guess_the_number::GuessTheNumberTrustedCall, Getter, TrustedCall, TrustedCallSigned,
 };
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,

diff --git a/cli/src/guess_the_number/commands/set_winnings.rs b/cli/src/guess_the_number/commands/set_winnings.rs
@@ -24,7 +24,7 @@ use crate::{
 };
 use ita_parentchain_interface::integritee::Balance;
 use ita_stf::{
-	guess_the_number::GuessTheNumberTrustedCall, Getter, Index, TrustedCall, TrustedCallSigned,
+	guess_the_number::GuessTheNumberTrustedCall, Getter, TrustedCall, TrustedCallSigned,
 };
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,

diff --git a/cli/src/trusted_base_cli/commands/add_session_proxy.rs b/cli/src/trusted_base_cli/commands/add_session_proxy.rs
@@ -23,7 +23,7 @@ use crate::{
 	Cli, CliResult, CliResultOk,
 };
 use chrono::{Duration, Utc};
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned};
+use ita_stf::{Getter, TrustedCall, TrustedCallSigned};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
 	types::{KeyPair, TrustedOperation},

diff --git a/cli/src/trusted_base_cli/commands/nonce.rs b/cli/src/trusted_base_cli/commands/nonce.rs
@@ -19,7 +19,6 @@ use crate::{
 	get_layer_two_nonce, trusted_cli::TrustedCli, trusted_command_utils::get_pair_from_str,
 	trusted_operation::perform_trusted_operation, Cli, CliResult, CliResultOk,
 };
-use ita_stf::Index;
 use itp_stf_primitives::types::{KeyPair, TrustedOperation};
 use itp_types::AccountId;
 use log::*;

diff --git a/cli/src/trusted_base_cli/commands/note_bloat.rs b/cli/src/trusted_base_cli/commands/note_bloat.rs
@@ -22,7 +22,7 @@ use crate::{
 	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned};
+use ita_stf::{Getter, TrustedCall, TrustedCallSigned};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
 	types::{KeyPair, TrustedOperation},

diff --git a/cli/src/trusted_base_cli/commands/transfer.rs b/cli/src/trusted_base_cli/commands/transfer.rs
@@ -24,7 +24,7 @@ use crate::{
 };
 use base58::ToBase58;
 use ita_parentchain_interface::integritee::Balance;
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned};
+use ita_stf::{Getter, TrustedCall, TrustedCallSigned};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
 	types::{KeyPair, TrustedOperation},

diff --git a/cli/src/trusted_base_cli/commands/unshield_funds.rs b/cli/src/trusted_base_cli/commands/unshield_funds.rs
@@ -23,7 +23,7 @@ use crate::{
 	Cli, CliResult, CliResultOk,
 };
 use ita_parentchain_interface::integritee::Balance;
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned};
+use ita_stf::{Getter, TrustedCall, TrustedCallSigned};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
 	types::{KeyPair, TrustedOperation},

diff --git a/cli/src/trusted_base_cli/commands/waste_time.rs b/cli/src/trusted_base_cli/commands/waste_time.rs
@@ -22,7 +22,7 @@ use crate::{
 	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
-use ita_stf::{Getter, Index, TrustedCall, TrustedCallSigned};
+use ita_stf::{Getter, TrustedCall, TrustedCallSigned};
 use itp_stf_primitives::{
 	traits::TrustedCallSigning,
 	types::{KeyPair, TrustedOperation},

diff --git a/cli/src/trusted_command_utils.rs b/cli/src/trusted_command_utils.rs
@@ -16,19 +16,14 @@
 */
 
 use crate::{
-	command_utils::{get_worker_api_direct, mrenclave_from_base58},
-	trusted_cli::TrustedCli,
-	trusted_operation::{perform_trusted_operation, read_shard},
-	Cli,
+	command_utils::mrenclave_from_base58, trusted_cli::TrustedCli,
+	trusted_operation::perform_trusted_operation, Cli,
 };
 use base58::{FromBase58, ToBase58};
-use codec::{Decode, Encode};
+use codec::Encode;
 use ita_stf::{Getter, TrustedCallSigned, TrustedGetter};
-use itc_rpc_client::direct_client::DirectApi;
-use itp_rpc::{RpcRequest, RpcResponse, RpcReturnValue};
 use itp_stf_primitives::types::{AccountId, KeyPair, ShardIdentifier, TrustedOperation};
-use itp_types::{AccountInfo, DirectRequestStatus};
-use itp_utils::{FromHexPrefixed, ToHexPrefixed};
+use itp_types::AccountInfo;
 use log::*;
 use sp_application_crypto::sr25519;
 use sp_core::{crypto::Ss58Codec, sr25519 as sr25519_core, Pair};
@@ -40,7 +35,6 @@ use substrate_client_keystore::LocalKeystore;
 macro_rules! get_layer_two_nonce {
 	($subject:ident, $signer_pair:ident, $cli: ident, $trusted_args:ident ) => {{
 		use ita_stf::{AccountInfo, Getter, TrustedCallSigned, TrustedGetter};
-		use $crate::trusted_command_utils::get_pending_trusted_calls_for;
 		let top = TrustedOperation::<TrustedCallSigned, Getter>::get(Getter::trusted(
 			TrustedGetter::account_info($subject.clone().into())
 				.sign(&KeyPair::Sr25519(Box::new($signer_pair.clone()))),
@@ -137,13 +131,3 @@ pub(crate) fn get_pair_from_str(trusted_args: &TrustedCli, account: &str) -> sr2
 		},
 	}
 }
-
-// helper method to get the pending trusted calls for a given account via direct RPC
-pub(crate) fn get_pending_trusted_calls_for(
-	_cli: &Cli,
-	_trusted_args: &TrustedCli,
-	_who: &AccountId,
-) -> Vec<TrustedOperation<TrustedCallSigned, Getter>> {
-	// see: https://github.com/integritee-network/worker/issues/1657
-	unimplemented!()
-}
diff --git a/sidechain/rpc-handler/src/direct_top_pool_api.rs b/sidechain/rpc-handler/src/direct_top_pool_api.rs
@@ -92,8 +92,8 @@ pub fn add_top_pool_direct_rpc_methods<R, TCS, G, OCallApi>(
 		Ok(json!(json_value))
 	});
 
-	let local_author = top_pool_author.clone();
-	let local_ocall_api = ocall_api.clone();
+	let local_author = top_pool_author;
+	let local_ocall_api = ocall_api;
 	io_handler.add_sync_method("author_pendingExtrinsics", move |params: Params| {
 		debug!("worker_api_direct rpc was called: author_pendingExtrinsics");
 		local_ocall_api