git.delta.rocks / unique-network / refs/commits / bd8bc1b3cf7e

difftreelog

chore fix cargo fmt

Grigoriy Simonov2022-10-25parent: #1ada10d.patch.diff
in: master

4 files changed

modifiednode/cli/src/command.rsdiffbeforeafterboth
--- 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;
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- 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 {
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- 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<void> {
-		
 		let caller = T::CrossAccountId::from_eth(caller);
 
 		let properties = properties
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
28 dispatch::CollectionDispatch,28 dispatch::CollectionDispatch,
29 erc::{29 erc::{static_property::key, CollectionHelpersEvents},
30 static_property::key,
31 CollectionHelpersEvents,
32 },
33 Pallet as PalletCommon,30 Pallet as PalletCommon,
34
38use sp_std::vec;34use sp_std::vec;
39use up_data_structs::{35use up_data_structs::{
40 CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,36 CollectionDescription, CollectionMode, CollectionName, CollectionTokenPrefix,
41 CreateCollectionData, PropertyValue,37 CreateCollectionData,
42};38};
4339
44use crate::{weights::WeightInfo, Config, SelfWeightOf};40use crate::{weights::WeightInfo, Config, SelfWeightOf};
88 Ok((caller, name, description, token_prefix))84 Ok((caller, name, description, token_prefix))
89}85}
90
91fn create_refungible_collection_internal<T: Config>(
92 caller: caller,
93 value: value,
94 name: string,
95 description: string,
96 token_prefix: string,
97) -> Result<address> {
98 self::create_collection_internal::<T>(
99 caller,
100 value,
101 name,
102 CollectionMode::ReFungible,
103 description,
104 token_prefix
105 )
106}
10786
108#[inline(always)]87#[inline(always)]
109fn create_collection_internal<T: Config>(88fn create_collection_internal<T: Config>(
244 )223 )
245 }224 }
246
247 #[weight(<SelfWeightOf<T>>::create_collection())]
248 #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")]
249 fn create_refungible_collection_with_properties(
250 &mut self,
251 caller: caller,
252 value: value,
253 name: string,
254 description: string,
255 token_prefix: string,
256 base_uri: string,
257 ) -> Result<address> {
258 create_collection_internal::<T>(
259 caller,
260 value,
261 name,
262 CollectionMode::ReFungible,
263 description,
264 token_prefix,
265 )
266 }
267225
268 #[weight(<SelfWeightOf<T>>::create_collection())]226 #[weight(<SelfWeightOf<T>>::create_collection())]
269 #[solidity(rename_selector = "createFTCollection")]227 #[solidity(rename_selector = "createFTCollection")]