diff --git a/ci/env b/ci/env index 4cab62682e..ca37f64c74 100644 --- a/ci/env +++ b/ci/env @@ -1,3 +1,3 @@ #!/bin/sh -export RUSTC_VERSION=nightly-2022-09-01 +export RUSTC_VERSION=nightly-2022-12-18 diff --git a/node/rpc/src/task.rs b/node/rpc/src/task.rs index baafa11728..1a485fbb17 100644 --- a/node/rpc/src/task.rs +++ b/node/rpc/src/task.rs @@ -57,7 +57,7 @@ where JsonRpseeError::Call(CallError::Custom(ErrorObject::owned( ErrorCode::InvalidParams.code(), "Not a valid hex-string or SS58 address.", - Some(format!("{:?}", e)), + Some(format!("{e:?}")), ))) })?; diff --git a/node/src/benchmarking.rs b/node/src/benchmarking.rs index d8b9ba26ad..0adcb2cbf5 100644 --- a/node/src/benchmarking.rs +++ b/node/src/benchmarking.rs @@ -175,6 +175,6 @@ pub fn inherent_benchmark_data() -> Result { timestamp .provide_inherent_data(&mut inherent_data) - .map_err(|e| format!("creating inherent data: {:?}", e))?; + .map_err(|e| format!("creating inherent data: {e:?}"))?; Ok(inherent_data) } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 1e66008a08..d527e296a7 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -17,7 +17,7 @@ pub type ChainSpec = sc_service::GenericChainSpec; /// Generate a crypto pair from seed. pub fn get_from_seed(seed: &str) -> ::Public { - TPublic::Pair::from_string(&format!("//{}", seed), None) + TPublic::Pair::from_string(&format!("//{seed}"), None) .expect("static values are valid; qed") .public() } diff --git a/node/src/cli.rs b/node/src/cli.rs index 16a500175f..03b71f2f02 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -12,7 +12,7 @@ fn parse_rpc_pair(input: &str) -> Result<(String, String), String> { Ok(s.trim_matches('\'').into()) } else if s.starts_with('\"') && s.ends_with('\"') { Ok(s.trim_matches('\"').into()) - } else if !s.starts_with(&['\'', '\"']) { + } else if !s.starts_with(['\'', '\"']) { Ok(s.into()) } else { Err(String::from("invalid quotes in rpc mapping")) diff --git a/node/src/service.rs b/node/src/service.rs index ed626390e6..d350bd3463 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -167,8 +167,8 @@ pub fn decode_mining_key( if let Some(key) = mining_key { // raw public key if let Some(key_without_prefix) = key.strip_prefix("0x") { - let key_bytes = hex::decode(&key_without_prefix) - .map_err(|e| format!("Invalid mining key, expected hex: {}", e))?; + let key_bytes = hex::decode(key_without_prefix) + .map_err(|e| format!("Invalid mining key, expected hex: {e}"))?; Ok(creditcoin_node_runtime::Signer::from( sp_core::ecdsa::Public::from_full(&key_bytes) .map_err(|_| String::from("Invalid mining key, expected 33 bytes"))?, @@ -181,7 +181,7 @@ pub fn decode_mining_key( Err(err) => match creditcoin_node_runtime::AccountId::from_ss58check(key) { Ok(account_id) => Ok(account_id), Err(e) => { - let msg = format!("Invalid mining key, failed to interpret it as an ECDSA public key (error: {}) and as an account ID (error: {})", err, e); + let msg = format!("Invalid mining key, failed to interpret it as an ECDSA public key (error: {err}) and as an account ID (error: {e})"); log::error!("{}", msg); Err(msg) }, @@ -215,8 +215,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result keystore_container.set_remote_keystore(k), Err(e) => { return Err(ServiceError::Other(format!( - "Error hooking up remote keystore for {}: {}", - url, e + "Error hooking up remote keystore for {url}: {e}" ))) }, }; @@ -370,7 +369,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result { count += 1; }, - Err(e) => eprintln!("Mining error: {}", e), + Err(e) => eprintln!("Mining error: {e}"), } if count >= 1_000_000 { mining_metrics.add(count); diff --git a/pallets/creditcoin/src/benchmarking.rs b/pallets/creditcoin/src/benchmarking.rs index 7301915890..46e208feb5 100644 --- a/pallets/creditcoin/src/benchmarking.rs +++ b/pallets/creditcoin/src/benchmarking.rs @@ -86,12 +86,12 @@ benchmarks! { for i in 0..c { let collector: T::AccountId = lender_account::(true); - let evm_address = format!("{:03x}",i).as_bytes() .into_bounded(); + let evm_address = format!("{i:03x}").as_bytes() .into_bounded(); let address_id = AddressId::new::(&CHAIN, &evm_address); let entry = Address { blockchain: CHAIN, value: evm_address.clone(), owner: collector.clone() }; >::insert(address_id, entry); - let tx_id = format!("{:03x}",i) .as_bytes() .into_bounded(); + let tx_id = format!("{i:03x}") .as_bytes() .into_bounded(); let collected_coins_id = CollectedCoinsId::new::(&CHAIN, &tx_id); let pending = types::UnverifiedCollectedCoins { to: evm_address.clone(), tx_id: tx_id.clone() , contract: Default::default()}; @@ -300,7 +300,7 @@ benchmarks! { >::set_timestamp(1u32.into()); let collector: T::AccountId = lender_account::(true); let collector_addr_id = register_eth_addr::(&collector, "collector"); - let address = Creditcoin::::addresses(&collector_addr_id).unwrap(); + let address = Creditcoin::::addresses(collector_addr_id).unwrap(); let tx_id = "40be73b6ea10ef3da3ab33a2d5184c8126c5b64b21ae1e083ee005f18e3f5fab" .as_bytes() .into_bounded(); @@ -427,13 +427,13 @@ fn generate_transfer( ) -> (TransferId, Transfer) { let (raw_tx, gain, who) = if swap_sender { ( - format!("0xcb13b65dd4d9d7f3cb8fcddeb442dfdf767403f8a9e5fe8587859225f8a620{:02x}", seed), + format!("0xcb13b65dd4d9d7f3cb8fcddeb442dfdf767403f8a9e5fe8587859225f8a620{seed:02x}"), 1u64, borrower_account::(true), ) } else { ( - format!("0xcb13b65dd4d9d7f3cb8fcddeb442dfdf767403f8a9e5fe8587859225f8a621{:02x}", seed), + format!("0xcb13b65dd4d9d7f3cb8fcddeb442dfdf767403f8a9e5fe8587859225f8a621{seed:02x}"), 0u64, lender_account::(true), ) @@ -649,7 +649,7 @@ fn generate_offer( fn register_eth_addr(who: &T::AccountId, seed: &str) -> AddressId<::Hash> { let ktypeid = KeyTypeId(*b"dumy"); - let pkey = ecdsa_generate(ktypeid, Some(format!("//{}", seed).as_bytes().to_vec())); + let pkey = ecdsa_generate(ktypeid, Some(format!("//{seed}").as_bytes().to_vec())); let address = EVMAddress::from_public(&pkey); let address_id = crate::AddressId::new::(&Blockchain::ETHEREUM, &address); @@ -670,9 +670,9 @@ fn generate_ask( call: bool, seed: u8, ) -> Result<(AddressId<::Hash>, AskOrderId, Vec), crate::Error> { - let secretkey = &format!("lender{:02x}", seed)[..]; + let secretkey = &format!("lender{seed:02x}")[..]; let address_id = register_eth_addr::(who, secretkey); - let guid = format!("ask_guid{:02x}", seed); + let guid = format!("ask_guid{seed:02x}"); let guid = guid.as_bytes(); let ask_order_id = AskOrderId::new::(*expiration_block, guid); @@ -698,9 +698,9 @@ fn generate_bid( call: bool, seed: u8, ) -> Result<(AddressId<::Hash>, BidOrderId, Vec), crate::Error> { - let secretkey = &format!("borrower{:02x}", seed)[..]; + let secretkey = &format!("borrower{seed:02x}")[..]; let address_id = register_eth_addr::(who, secretkey); - let guid = format!("bid_guid{:02x}", seed); + let guid = format!("bid_guid{seed:02x}"); let guid = guid.as_bytes(); let bid_order_id = BidOrderId::new::(*expiration_block, guid); @@ -721,12 +721,12 @@ fn generate_bid( } fn fake_address_id(seed: u32) -> AddressId { - let address = format!("somefakeaddress{}", seed); + let address = format!("somefakeaddress{seed}"); crate::AddressId::new::(&Blockchain::ETHEREUM, address.as_bytes()) } fn insert_fake_address(owner: T::AccountId, seed: u32) -> AddressId { - let addr = format!("somefakeaddress{}", seed); + let addr = format!("somefakeaddress{seed}"); let id = crate::AddressId::new::(&Blockchain::ETHEREUM, addr.as_bytes()); let address = crate::Address { @@ -744,7 +744,7 @@ fn fake_ask_id( seed: u32, expiration_block: BlockNumberFor, ) -> AskOrderId { - let guid = format!("somefakeaskguid{}", seed); + let guid = format!("somefakeaskguid{seed}"); crate::AskOrderId::new::(expiration_block, guid.as_bytes()) } @@ -772,7 +772,7 @@ fn fake_bid_id( seed: u32, expiration_block: BlockNumberFor, ) -> BidOrderId { - let guid = format!("somefakebidguid{}", seed); + let guid = format!("somefakebidguid{seed}"); crate::BidOrderId::new::(expiration_block, guid.as_bytes()) } @@ -832,7 +832,7 @@ fn fake_deal_id( } fn fake_transfer_id(seed: u32) -> TransferId { - let tx_id = format!("somefaketransfertxid{}", seed); + let tx_id = format!("somefaketransfertxid{seed}"); crate::TransferId::new::(&Blockchain::ETHEREUM, tx_id.as_bytes()) } @@ -872,8 +872,8 @@ fn insert_fake_unverified_transfer( deadline: BlockNumberFor, seed: u32, ) { - let from_external = format!("somefakefromext{}", seed).as_bytes().into_bounded(); - let to_external = format!("somefaketoext{}", seed).as_bytes().into_bounded(); + let from_external = format!("somefakefromext{seed}").as_bytes().into_bounded(); + let to_external = format!("somefaketoext{seed}").as_bytes().into_bounded(); let transfer_id = fake_transfer_id::(seed); let transfer = crate::UnverifiedTransfer { deadline, @@ -896,7 +896,7 @@ fn insert_fake_unverified_transfer( &fake_bid_id::(seed, deadline), ), ), - tx_id: format!("{:03x}", seed).as_bytes().into_bounded(), + tx_id: format!("{seed:03x}").as_bytes().into_bounded(), timestamp: None, }, currency_to_check: crate::CurrencyOrLegacyTransferKind::TransferKind( diff --git a/pallets/creditcoin/src/helpers.rs b/pallets/creditcoin/src/helpers.rs index 5c7aabe40e..abc7e45795 100644 --- a/pallets/creditcoin/src/helpers.rs +++ b/pallets/creditcoin/src/helpers.rs @@ -54,7 +54,7 @@ impl Pallet { >::get() } pub fn get_address(address_id: &AddressId) -> Result, Error> { - Self::addresses(&address_id).ok_or(Error::::NonExistentAddress) + Self::addresses(address_id).ok_or(Error::::NonExistentAddress) } pub fn authority_id() -> Option { diff --git a/pallets/creditcoin/src/helpers/register_transfer.rs b/pallets/creditcoin/src/helpers/register_transfer.rs index b89833fb1f..88c0a68c80 100644 --- a/pallets/creditcoin/src/helpers/register_transfer.rs +++ b/pallets/creditcoin/src/helpers/register_transfer.rs @@ -33,7 +33,7 @@ impl Pallet { let transfer_id = TransferId::new::(&from.blockchain, &blockchain_tx_id); ensure!(!Transfers::::contains_key(&transfer_id), Error::::TransferAlreadyRegistered); - let currency = Currencies::::get(¤cy).ok_or(Error::::CurrencyNotRegistered)?; + let currency = Currencies::::get(currency).ok_or(Error::::CurrencyNotRegistered)?; ensure!(currency.supports(&transfer_kind), Error::::UnsupportedTransferKind); @@ -64,7 +64,7 @@ impl Pallet { }; let task_id = TaskId::from(transfer_id.clone()); let pending = Task::from(pending); - PendingTasks::::insert(&deadline, &task_id, &pending); + PendingTasks::::insert(deadline, task_id, &pending); Ok((transfer_id, transfer)) } @@ -97,7 +97,7 @@ impl Pallet { DealOrders::::mutate( deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.hash(), |deal_order| -> Result<(), crate::Error> { let mut deal_order = deal_order.as_mut().ok_or(Error::::NonExistentDealOrder)?; let currency = match &from.blockchain { @@ -155,7 +155,7 @@ impl Pallet { }; let task_id = TaskId::from(transfer_id.clone()); let pending = Task::from(pending); - PendingTasks::::insert(&deadline, &task_id, &pending); + PendingTasks::::insert(deadline, task_id, &pending); Ok((transfer_id, transfer)) } diff --git a/pallets/creditcoin/src/lib.rs b/pallets/creditcoin/src/lib.rs index 9ce9c101ce..6a067875e6 100644 --- a/pallets/creditcoin/src/lib.rs +++ b/pallets/creditcoin/src/lib.rs @@ -1213,12 +1213,12 @@ pub mod pallet { let deadline = Self::block_number().saturating_add(T::UnverifiedTaskTimeout::get()); ensure!( - !PendingTasks::::contains_key(deadline, &TaskId::from(collect_coins_id.clone())), + !PendingTasks::::contains_key(deadline, TaskId::from(collect_coins_id.clone())), Error::::CollectCoinsAlreadyRegistered ); let address_id = AddressId::new::(contract_chain, &evm_address); - let address = Self::addresses(&address_id).ok_or(Error::::NonExistentAddress)?; + let address = Self::addresses(address_id).ok_or(Error::::NonExistentAddress)?; ensure!(address.owner == who, Error::::NotAddressOwner); let pending = types::UnverifiedCollectedCoins { to: evm_address, tx_id, contract }; @@ -1354,8 +1354,8 @@ pub mod pallet { let who = ensure_signed(origin)?; DealOrders::::try_mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |value| -> DispatchResult { let deal_order = value.as_mut().ok_or(crate::Error::::NonExistentDealOrder)?; @@ -1444,7 +1444,7 @@ pub mod pallet { }, }; - PendingTasks::::remove(&deadline, &task_id); + PendingTasks::::remove(deadline, task_id); Self::deposit_event(event); @@ -1468,20 +1468,20 @@ pub mod pallet { let event = match &task_id { TaskId::VerifyTransfer(transfer_id) => { ensure!( - !Transfers::::contains_key(&transfer_id), + !Transfers::::contains_key(transfer_id), Error::::TransferAlreadyRegistered ); Event::::TransferFailedVerification(transfer_id.clone(), cause) }, TaskId::CollectCoins(collected_coins_id) => { ensure!( - !CollectedCoins::::contains_key(&collected_coins_id), + !CollectedCoins::::contains_key(collected_coins_id), Error::::CollectCoinsAlreadyRegistered ); Event::::CollectCoinsFailedVerification(collected_coins_id.clone(), cause) }, }; - PendingTasks::::remove(&deadline, &task_id); + PendingTasks::::remove(deadline, &task_id); Self::deposit_event(event); Ok(PostDispatchInfo { actual_weight: None, pays_fee: Pays::No }) diff --git a/pallets/creditcoin/src/mock.rs b/pallets/creditcoin/src/mock.rs index d41d1b9d65..6e485a8cd5 100644 --- a/pallets/creditcoin/src/mock.rs +++ b/pallets/creditcoin/src/mock.rs @@ -422,7 +422,7 @@ fn get_mock_contract_input(index: usize, convert: impl FnOnce(ethabi::Token) .as_str() .unwrap() .to_string(); - let input_bytes = hex::decode(&input.trim_start_matches("0x")).unwrap(); + let input_bytes = hex::decode(input.trim_start_matches("0x")).unwrap(); let inputs = abi.decode_input(&input_bytes[4..]).unwrap(); convert(inputs[index].clone()).unwrap() } diff --git a/pallets/creditcoin/src/ocw/rpc.rs b/pallets/creditcoin/src/ocw/rpc.rs index 14f67832b1..43c776735e 100644 --- a/pallets/creditcoin/src/ocw/rpc.rs +++ b/pallets/creditcoin/src/ocw/rpc.rs @@ -127,7 +127,7 @@ impl<'a> Visitor<'a> for BytesVisitor { { if value.len() >= 2 && &value[0..2] == "0x" { let bytes = hex::decode(&value[2..]) - .map_err(|e| Error::custom(alloc::format!("Invalid hex: {}", e)))?; + .map_err(|e| Error::custom(alloc::format!("Invalid hex: {e}")))?; Ok(Bytes(bytes)) } else { Err(Error::invalid_value(Unexpected::Str(value), &"0x prefix")) @@ -322,7 +322,7 @@ fn to_json_hex(bytes: &[u8]) -> String { } fn format_as_hex(value: T) -> String { - alloc::format!("0x{:x}", value) + alloc::format!("0x{value:x}") } pub fn eth_get_transaction( diff --git a/pallets/creditcoin/src/ocw/tasks/collect_coins.rs b/pallets/creditcoin/src/ocw/tasks/collect_coins.rs index 8e96cc3a49..520061231f 100644 --- a/pallets/creditcoin/src/ocw/tasks/collect_coins.rs +++ b/pallets/creditcoin/src/ocw/tasks/collect_coins.rs @@ -98,7 +98,7 @@ pub fn validate_collect_coins( if selector != transfer_fn.short_signature() { log::error!( "function selector mismatch, expected: {}, got: {}", - hex::encode(&transfer_fn.short_signature()), + hex::encode(transfer_fn.short_signature()), hex::encode(selector) ); return Err(VerificationFailureCause::AbiMismatch.into()); @@ -244,7 +244,7 @@ pub(crate) mod tests { fn prepare_rpc_mocks() -> MockedRpcRequests { let dummy_url = "dummy"; let contract_chain = Creditcoin::::collect_coins_contract(); - set_rpc_uri(&contract_chain.chain, &dummy_url); + set_rpc_uri(&contract_chain.chain, dummy_url); MockedRpcRequests::new(dummy_url, &TX_HASH, &BLOCK_NUMBER_STR, &RESPONSES) } diff --git a/pallets/creditcoin/src/ocw/tests.rs b/pallets/creditcoin/src/ocw/tests.rs index ab6d75c715..207a5a2d38 100644 --- a/pallets/creditcoin/src/ocw/tests.rs +++ b/pallets/creditcoin/src/ocw/tests.rs @@ -331,7 +331,7 @@ fn blockchain_rpc_url_missing() { #[test] fn blockchain_rpc_url_non_utf8() { ExtBuilder::default().build_offchain_and_execute(|| { - set_rpc_uri(&Blockchain::ETHEREUM, &[0x80]); + set_rpc_uri(&Blockchain::ETHEREUM, [0x80]); assert_matches!(Blockchain::ETHEREUM.rpc_url().unwrap_err(), RpcUrlError::InvalidUrl(_)); }); @@ -891,7 +891,7 @@ fn ocw_retries() { let tx_block_num_value = u64::from_str_radix(tx_block_num.trim_start_matches("0x"), 16).unwrap(); - set_rpc_uri(&Blockchain::RINKEBY, &dummy_url); + set_rpc_uri(&Blockchain::RINKEBY, dummy_url); let loan_amount = get_mock_amount(); let terms = LoanTerms { amount: loan_amount, ..Default::default() }; @@ -976,7 +976,7 @@ fn duplicate_retry_fail_and_succeed() { MockedRpcRequests::new(dummy_url, &tx_hash, &tx_block_num, ÐLESS_RESPONSES) .mock_all(&mut state.write()); - set_rpc_uri(&Blockchain::RINKEBY, &dummy_url); + set_rpc_uri(&Blockchain::RINKEBY, dummy_url); let loan_amount = get_mock_amount(); let currency = crate::tests::ethless_currency(contract.clone()); diff --git a/pallets/creditcoin/src/tests.rs b/pallets/creditcoin/src/tests.rs index 61da31c15c..6bab8fca71 100644 --- a/pallets/creditcoin/src/tests.rs +++ b/pallets/creditcoin/src/tests.rs @@ -199,7 +199,7 @@ impl TestInfo { } pub fn register_currency(&self) { - if !Currencies::::contains_key(&self.currency.to_id::()) { + if !Currencies::::contains_key(self.currency.to_id::()) { assert_ok!(Creditcoin::register_currency(Origin::root(), self.currency.clone())); } } @@ -559,7 +559,7 @@ fn register_transfer_ocw_fail_to_send() { MockedRpcRequests::new(dummy_url, &tx_hash, &tx_block_num, ÐLESS_RESPONSES) .mock_all(&mut state.write()); - set_rpc_uri(&Blockchain::RINKEBY, &dummy_url); + set_rpc_uri(&Blockchain::RINKEBY, dummy_url); let loan_amount = get_mock_amount(); let currency = ethless_currency(contract.clone()); @@ -1054,8 +1054,8 @@ fn lock_deal_order_should_emit_deal_order_locked_event() { let (deal_order_id, deal_order) = test_info.create_deal_order(); crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().funding_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"12345678")); @@ -1128,8 +1128,8 @@ fn lock_deal_order_should_fail_for_non_borrower() { // simulate deal transfer crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().funding_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"12345678")); @@ -1152,8 +1152,8 @@ fn lock_deal_order_should_fail_if_already_locked() { // simulate deal transfer crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().funding_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"12345678")); @@ -1184,8 +1184,8 @@ fn lock_deal_order_locks_by_borrower() { // simulate deal transfer crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().funding_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"12345678")); @@ -1226,8 +1226,8 @@ fn fund_deal_order_should_error_when_address_not_registered() { // simulate deal with an address that isn't registered crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { let blockchain = Blockchain::RINKEBY; @@ -1274,8 +1274,8 @@ fn fund_deal_order_should_error_when_timestamp_is_in_the_future() { // simulate deal with a timestamp in the future crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().timestamp = Creditcoin::timestamp() + 99999; }, @@ -1301,8 +1301,8 @@ fn fund_deal_order_should_error_when_deal_is_funded() { // simulate a funded deal crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().funding_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"12345678")); @@ -1331,8 +1331,8 @@ fn fund_deal_order_should_error_when_deal_has_expired() { // simulate an expired deal by setting expiration_block < head crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().expiration_block = 0; }, @@ -1424,8 +1424,8 @@ fn fund_deal_order_should_error_when_transfer_amount_doesnt_match() { // modify deal amount in order to cause transfer mismatch crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { // note: the transfer above has amount of 0 b/c it is an exemption! deal_order_storage.as_mut().unwrap().terms.amount = ExternalAmount::from(4444u64); @@ -2194,8 +2194,8 @@ fn close_deal_order_should_error_when_borrower_address_is_not_registered() { // simulate deal with an address that isn't registered crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { let blockchain = Blockchain::RINKEBY; @@ -2243,8 +2243,8 @@ fn close_deal_order_should_error_when_deal_timestamp_is_in_the_future() { // simulate deal with a timestamp in the future crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().timestamp = Creditcoin::timestamp() + 99999; }, @@ -2270,8 +2270,8 @@ fn close_deal_order_should_error_when_deal_order_has_already_been_repaid() { // simulate DealOrder which has been repaid crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().repayment_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"4444")); @@ -2298,8 +2298,8 @@ fn close_deal_order_should_error_when_deal_isnt_locked() { // simulate deal which is not locked crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = None; }, @@ -2324,8 +2324,8 @@ fn close_deal_order_should_error_when_transfer_order_id_doesnt_match_deal_order_ // lock DealOrder crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = Some(test_info.borrower.account_id.clone()); @@ -2373,8 +2373,8 @@ fn close_deal_order_should_error_when_transfer_block_is_greater_than_current_blo // lock DealOrder crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = Some(test_info.borrower.account_id.clone()); @@ -2411,8 +2411,8 @@ fn close_deal_order_should_error_when_transfer_sighash_doesnt_match_borrower() { // lock DealOrder crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = Some(test_info.borrower.account_id.clone()); @@ -2447,8 +2447,8 @@ fn close_deal_order_should_error_when_transfer_has_already_been_processed() { // lock DealOrder crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = Some(test_info.borrower.account_id.clone()); @@ -2488,8 +2488,8 @@ fn close_deal_order_should_succeed() { // lock DealOrder crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().lock = Some(test_info.borrower.account_id.clone()); @@ -2571,8 +2571,8 @@ fn exempt_should_error_when_deal_order_has_already_been_repaid() { // simulate DealOrder which has been repaid crate::DealOrders::::mutate( - &deal_order_id.expiration(), - &deal_order_id.hash(), + deal_order_id.expiration(), + deal_order_id.hash(), |deal_order_storage| { deal_order_storage.as_mut().unwrap().repayment_transfer_id = Some(TransferId::new::(&test_info.blockchain, b"4444")); diff --git a/pallets/creditcoin/src/types.rs b/pallets/creditcoin/src/types.rs index 3f2f3c473c..0f09b7f844 100644 --- a/pallets/creditcoin/src/types.rs +++ b/pallets/creditcoin/src/types.rs @@ -394,7 +394,7 @@ impl From<&ecdsa::Public> for LegacySighash { let mut hasher = sha2::Sha512::new(); hasher.update(compressed_key_hex.as_bytes()); let key_hash = hasher.finalize(); - let key_hash_hex = hex::encode(&key_hash); + let key_hash_hex = hex::encode(key_hash); const SKIP_TO_GET_60: usize = 512 / 8 * 2 - 60; // 512 - hash size in bits, 8 - bits in byte, 2 - hex digits for byte, 60 - merkle address length (70) without creditcoin namespace length (6) and prefix length (4) @@ -782,6 +782,6 @@ mod test { fn exercise_invalid_term_length_error_clone_and_runtime_debug() { let value = InvalidTermLengthError; let new_value = value.clone(); - format!("{:?}", new_value); + format!("{new_value:?}"); } } diff --git a/sha3pow/src/lib.rs b/sha3pow/src/lib.rs index 8885e77f02..b85d20de64 100644 --- a/sha3pow/src/lib.rs +++ b/sha3pow/src/lib.rs @@ -83,8 +83,7 @@ where let parent_id = BlockId::::hash(parent); self.runtime_api().difficulty(&parent_id).map_err(|err| { sc_consensus_pow::Error::Environment(format!( - "Fetching difficulty from runtime failed: {:?}", - err + "Fetching difficulty from runtime failed: {err:?}" )) }) } @@ -152,7 +151,7 @@ where C: GetDifficulty, { let mut rng = SmallRng::from_rng(&mut rand::thread_rng()).map_err(|e| { - sc_consensus_pow::Error::Environment(format!("Initialize RNG failed for mining: {:?}", e)) + sc_consensus_pow::Error::Environment(format!("Initialize RNG failed for mining: {e:?}")) })?; let nonce = H256::random_using(&mut rng); diff --git a/test/client/src/lib.rs b/test/client/src/lib.rs index 3347676a69..a688bdebe4 100644 --- a/test/client/src/lib.rs +++ b/test/client/src/lib.rs @@ -72,7 +72,7 @@ impl substrate_test_client::GenesisInit for GenesisParameters { .insert(sp_core::storage::well_known_keys::CODE.to_vec(), code.clone()); } - let child_roots = storage.children_default.iter().map(|(_sk, child_content)| { + let child_roots = storage.children_default.values().map(|child_content| { let state_root = <<::Header as HeaderT>::Hashing as HashT>::trie_root( child_content.data.clone().into_iter().collect(), sp_runtime::StateVersion::V1,