From bd8bc1b3cf7ebd6afc0c58c45e9d07e955e0e54c Mon Sep 17 00:00:00 2001 From: Grigoriy Simonov Date: Tue, 25 Oct 2022 07:59:38 +0000 Subject: [PATCH] chore: fix cargo fmt --- --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -33,9 +33,7 @@ // limitations under the License. use crate::{ - chain_spec::{ - self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification, default_runtime, - }, + chain_spec::{self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification}, cli::{Cli, RelayChainCli, Subcommand}, service::{new_partial, start_node, start_dev_node}, }; @@ -46,7 +44,7 @@ #[cfg(feature = "quartz-runtime")] use crate::service::QuartzRuntimeExecutor; -use crate::service::{OpalRuntimeExecutor, DefaultRuntimeExecutor}; +use crate::service::OpalRuntimeExecutor; use codec::Encode; use cumulus_primitives_core::ParaId; --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -46,7 +46,6 @@ use cumulus_relay_chain_rpc_interface::{RelayChainRpcInterface, create_client_and_start_worker}; // Substrate Imports -use sc_client_api::ExecutorProvider; use sc_executor::NativeElseWasmExecutor; use sc_executor::NativeExecutionDispatch; use sc_network::{NetworkService, NetworkBlock}; @@ -83,15 +82,6 @@ /// Opal native executor instance. pub struct OpalRuntimeExecutor; - -#[cfg(feature = "unique-runtime")] -pub type DefaultRuntimeExecutor = UniqueRuntimeExecutor; - -#[cfg(all(not(feature = "unique-runtime"), feature = "quartz-runtime"))] -pub type DefaultRuntimeExecutor = QuartzRuntimeExecutor; - -#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))] -pub type DefaultRuntimeExecutor = OpalRuntimeExecutor; #[cfg(feature = "unique-runtime")] impl NativeExecutionDispatch for UniqueRuntimeExecutor { --- a/pallets/common/src/erc.rs +++ b/pallets/common/src/erc.rs @@ -27,7 +27,7 @@ use sp_std::vec::Vec; use up_data_structs::{ AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property, - SponsoringRateLimit, SponsorshipState, PropertyKey, + SponsoringRateLimit, SponsorshipState, }; use alloc::format; @@ -106,7 +106,6 @@ caller: caller, properties: Vec<(string, bytes)>, ) -> Result { - let caller = T::CrossAccountId::from_eth(caller); let properties = properties --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -26,19 +26,15 @@ use pallet_common::{ CollectionById, dispatch::CollectionDispatch, - erc::{ - static_property::key, - CollectionHelpersEvents, - }, + erc::{static_property::key, CollectionHelpersEvents}, Pallet as PalletCommon, - }; use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult}; use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder}; use sp_std::vec; use up_data_structs::{ CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix, - CreateCollectionData, PropertyValue, + CreateCollectionData, }; use crate::{weights::WeightInfo, Config, SelfWeightOf}; @@ -86,23 +82,6 @@ error_field_too_long(stringify!(token_prefix), CollectionTokenPrefix::bound()) })?; Ok((caller, name, description, token_prefix)) -} - -fn create_refungible_collection_internal( - caller: caller, - value: value, - name: string, - description: string, - token_prefix: string, -) -> Result
{ - self::create_collection_internal::( - caller, - value, - name, - CollectionMode::ReFungible, - description, - token_prefix - ) } #[inline(always)] @@ -233,27 +212,6 @@ name: string, description: string, token_prefix: string, - ) -> Result
{ - create_collection_internal::( - caller, - value, - name, - CollectionMode::ReFungible, - description, - token_prefix, - ) - } - - #[weight(>::create_collection())] - #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")] - fn create_refungible_collection_with_properties( - &mut self, - caller: caller, - value: value, - name: string, - description: string, - token_prefix: string, - base_uri: string, ) -> Result
{ create_collection_internal::( caller, -- gitstuff