--- a/Cargo.toml +++ b/Cargo.toml @@ -26,8 +26,8 @@ opt-level = 3 [profile.integration-tests] +debug-assertions = true inherits = "release" -debug-assertions = true [workspace.dependencies] # Unique --- a/node/cli/src/command.rs +++ b/node/cli/src/command.rs @@ -32,20 +32,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -use std::time::Duration; - -use codec::Encode; -use cumulus_client_cli::generate_genesis_block; use cumulus_primitives_core::ParaId; -use log::{debug, info}; +use log::info; use sc_cli::{ ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, - NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, + NetworkParams, Result, SharedParams, SubstrateCli, }; use sc_service::config::{BasePath, PrometheusConfig}; -use sp_core::hexdisplay::HexDisplay; -use sp_runtime::traits::{AccountIdConversion, Block as BlockT}; -use up_common::types::opaque::{Block, RuntimeId}; +use sp_runtime::traits::AccountIdConversion; +use up_common::types::opaque::RuntimeId; #[cfg(feature = "runtime-benchmarks")] use crate::chain_spec::default_runtime; --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -824,8 +824,8 @@ { use fc_consensus::FrontierBlockImport; use sc_consensus_manual_seal::{ - run_manual_seal, run_delayed_finalize, EngineCommand, ManualSealParams, - DelayedFinalizeParams, + run_delayed_finalize, run_manual_seal, DelayedFinalizeParams, EngineCommand, + ManualSealParams, }; let sc_service::PartialComponents { --- a/pallets/collator-selection/src/benchmarking.rs +++ b/pallets/collator-selection/src/benchmarking.rs @@ -35,15 +35,15 @@ use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller}; use frame_support::{ assert_ok, - parity_scale_codec::Decode, traits::{ fungible::{Inspect, Mutate}, EnsureOrigin, Get, }, }; -use frame_system::{EventRecord, RawOrigin}; +use frame_system::{pallet_prelude::*, EventRecord, RawOrigin}; use pallet_authorship::EventHandler; use pallet_session::{self as session, SessionManager}; +use parity_scale_codec::Decode; use sp_std::prelude::*; use super::*; @@ -338,7 +338,7 @@ register_candidates::(c); let new_block: BlockNumberFor= 1800u32.into(); - let zero_block: T::BlockNumber = 0u32.into(); + let zero_block: BlockNumberFor = 0u32.into(); let candidates = >::get(); let non_removals = c.saturating_sub(r); --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -54,9 +54,9 @@ extern crate alloc; use core::{ + marker::PhantomData, ops::{Deref, DerefMut}, slice::from_ref, - marker::PhantomData, }; use evm_coder::ToLog; --- a/pallets/configuration/src/benchmarking.rs +++ b/pallets/configuration/src/benchmarking.rs @@ -18,7 +18,7 @@ use frame_benchmarking::benchmarks; use frame_support::assert_ok; -use frame_system::{EventRecord, RawOrigin}; +use frame_system::{pallet_prelude::*, EventRecord, RawOrigin}; use super::*; --- a/pallets/inflation/src/benchmarking.rs +++ b/pallets/inflation/src/benchmarking.rs @@ -17,7 +17,7 @@ #![cfg(feature = "runtime-benchmarks")] use frame_benchmarking::benchmarks; -use frame_support::traits::OnInitialize; +use frame_support::{pallet_prelude::*, traits::Hooks}; use super::*; use crate::Pallet as Inflation; @@ -25,9 +25,9 @@ benchmarks! { on_initialize { - let block1: T::BlockNumber = T::BlockNumber::from(1u32); - let block2: T::BlockNumber = T::BlockNumber::from(2u32); - Inflation::::on_initialize(block1); // Create Treasury account - }: { Inflation::::on_initialize(block2); } // Benchmark deposit_into_existing path + let block1: BlockNumberFor = 1u32.into(); + let block2: BlockNumberFor = 2u32.into(); + as Hooks>::on_initialize(block1); // Create Treasury account + }: { as Hooks>::on_initialize(block2); } // Benchmark deposit_into_existing path } --- a/pallets/nonfungible/src/benchmarking.rs +++ b/pallets/nonfungible/src/benchmarking.rs @@ -18,7 +18,7 @@ use pallet_common::{ bench_init, benchmarking::{ - create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions, + create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value, }, CommonCollectionOperations, }; --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -103,9 +103,9 @@ }; pub use pallet::*; use pallet_common::{ - Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle, - eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf, - weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info, + eth::collection_id_to_address, helpers::add_weight_to_post_info, + weights::WeightInfo as CommonWeightInfo, CollectionHandle, Error as CommonError, + Event as CommonEvent, Pallet as PalletCommon, SelfWeightOf as PalletCommonWeightOf, }; use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm}; use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder}; @@ -116,9 +116,9 @@ use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome}; use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec}; use up_data_structs::{ - AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData, - mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue, - PropertyKeyPermission, PropertyScope, TokenChild, AuxPropertyValue, PropertiesPermissionMap, + budget::Budget, mapping::TokenAddressMapping, AccessMode, AuxPropertyValue, CollectionId, + CreateCollectionData, CreateNftExData, CustomDataLimit, PropertiesPermissionMap, Property, + PropertyKey, PropertyKeyPermission, PropertyScope, PropertyValue, TokenChild, TokenId, TokenProperties as TokenPropertiesT, }; use weights::WeightInfo; --- a/pallets/refungible/src/benchmarking.rs +++ b/pallets/refungible/src/benchmarking.rs @@ -20,7 +20,7 @@ use pallet_common::{ bench_init, benchmarking::{ - create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions, + create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value, }, }; use sp_std::prelude::*; --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -106,7 +106,7 @@ budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData, CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey, PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError, - TokenProperties as TokenPropertiesT, TrySetProperty, MAX_REFUNGIBLE_PIECES, + TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES, }; use crate::{erc::ERC721Events, erc_token::ERC20Events}; --- a/runtime/opal/src/xcm_barrier.rs +++ b/runtime/opal/src/xcm_barrier.rs @@ -15,8 +15,10 @@ // along with Unique Network. If not, see . use frame_support::{match_types, traits::Everything}; -use xcm::latest::{Junctions::*, MultiLocation}; -use staging_xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit, AllowExplicitUnpaidExecutionFrom}; +use staging_xcm::latest::{Junctions::*, MultiLocation}; +use staging_xcm_builder::{ + AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit, +}; match_types! { pub type ParentOnly: impl Contains = { --- a/runtime/quartz/src/xcm_barrier.rs +++ b/runtime/quartz/src/xcm_barrier.rs @@ -17,8 +17,8 @@ use frame_support::{match_types, traits::Everything}; use staging_xcm::latest::{Junctions::*, MultiLocation}; use staging_xcm_builder::{ - AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit, - AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom, + AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom, + AllowTopLevelPaidExecutionFrom, TakeWeightCredit, }; use crate::PolkadotXcm; --- a/runtime/unique/src/xcm_barrier.rs +++ b/runtime/unique/src/xcm_barrier.rs @@ -17,8 +17,8 @@ use frame_support::{match_types, traits::Everything}; use staging_xcm::latest::{Junctions::*, MultiLocation}; use staging_xcm_builder::{ - AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit, - AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom, + AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom, + AllowTopLevelPaidExecutionFrom, TakeWeightCredit, }; use crate::PolkadotXcm;