difftreelog
fixup(imports): post-rebase
in: master
14 files changed
Cargo.tomldiffbeforeafterboth26opt-level = 326opt-level = 3272728[profile.integration-tests]28[profile.integration-tests]29inherits = "release"30debug-assertions = true29debug-assertions = true30inherits = "release"313132[workspace.dependencies]32[workspace.dependencies]33# Unique33# Uniquenode/cli/src/command.rsdiffbeforeafterboth32// See the License for the specific language governing permissions and32// See the License for the specific language governing permissions and33// limitations under the License.33// limitations under the License.343435use std::time::Duration;3637use codec::Encode;38use cumulus_client_cli::generate_genesis_block;39use cumulus_primitives_core::ParaId;35use cumulus_primitives_core::ParaId;40use log::{debug, info};36use log::info;41use sc_cli::{37use sc_cli::{42 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,38 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,43 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,39 NetworkParams, Result, SharedParams, SubstrateCli,44};40};45use sc_service::config::{BasePath, PrometheusConfig};41use sc_service::config::{BasePath, PrometheusConfig};46use sp_core::hexdisplay::HexDisplay;47use sp_runtime::traits::{AccountIdConversion, Block as BlockT};42use sp_runtime::traits::AccountIdConversion;48use up_common::types::opaque::{Block, RuntimeId};43use up_common::types::opaque::RuntimeId;494450#[cfg(feature = "runtime-benchmarks")]45#[cfg(feature = "runtime-benchmarks")]51use crate::chain_spec::default_runtime;46use crate::chain_spec::default_runtime;node/cli/src/service.rsdiffbeforeafterboth824{824{825 use fc_consensus::FrontierBlockImport;825 use fc_consensus::FrontierBlockImport;826 use sc_consensus_manual_seal::{826 use sc_consensus_manual_seal::{827 run_manual_seal, run_delayed_finalize, EngineCommand, ManualSealParams,827 run_delayed_finalize, run_manual_seal, DelayedFinalizeParams, EngineCommand,828 DelayedFinalizeParams,828 ManualSealParams,829 };829 };830830831 let sc_service::PartialComponents {831 let sc_service::PartialComponents {pallets/collator-selection/src/benchmarking.rsdiffbeforeafterboth35use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};35use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite, whitelisted_caller};36use frame_support::{36use frame_support::{37 assert_ok,37 assert_ok,38 parity_scale_codec::Decode,39 traits::{38 traits::{40 fungible::{Inspect, Mutate},39 fungible::{Inspect, Mutate},41 EnsureOrigin, Get,40 EnsureOrigin, Get,42 },41 },43};42};44use frame_system::{EventRecord, RawOrigin};43use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};45use pallet_authorship::EventHandler;44use pallet_authorship::EventHandler;46use pallet_session::{self as session, SessionManager};45use pallet_session::{self as session, SessionManager};46use parity_scale_codec::Decode;47use sp_std::prelude::*;47use sp_std::prelude::*;484849use super::*;49use super::*;338 register_candidates::<T>(c);338 register_candidates::<T>(c);339339340 let new_block: BlockNumberFor<T>= 1800u32.into();340 let new_block: BlockNumberFor<T>= 1800u32.into();341 let zero_block: T::BlockNumber = 0u32.into();341 let zero_block: BlockNumberFor<T> = 0u32.into();342 let candidates = <Candidates<T>>::get();342 let candidates = <Candidates<T>>::get();343343344 let non_removals = c.saturating_sub(r);344 let non_removals = c.saturating_sub(r);pallets/common/src/lib.rsdiffbeforeafterboth54extern crate alloc;54extern crate alloc;555556use core::{56use core::{57 marker::PhantomData,57 ops::{Deref, DerefMut},58 ops::{Deref, DerefMut},58 slice::from_ref,59 slice::from_ref,59 marker::PhantomData,60};60};616162use evm_coder::ToLog;62use evm_coder::ToLog;pallets/configuration/src/benchmarking.rsdiffbeforeafterboth181819use frame_benchmarking::benchmarks;19use frame_benchmarking::benchmarks;20use frame_support::assert_ok;20use frame_support::assert_ok;21use frame_system::{EventRecord, RawOrigin};21use frame_system::{pallet_prelude::*, EventRecord, RawOrigin};222223use super::*;23use super::*;2424pallets/inflation/src/benchmarking.rsdiffbeforeafterboth17#![cfg(feature = "runtime-benchmarks")]17#![cfg(feature = "runtime-benchmarks")]181819use frame_benchmarking::benchmarks;19use frame_benchmarking::benchmarks;20use frame_support::traits::OnInitialize;20use frame_support::{pallet_prelude::*, traits::Hooks};212122use super::*;22use super::*;23use crate::Pallet as Inflation;23use crate::Pallet as Inflation;242425benchmarks! {25benchmarks! {262627 on_initialize {27 on_initialize {28 let block1: T::BlockNumber = T::BlockNumber::from(1u32);28 let block1: BlockNumberFor<T> = 1u32.into();29 let block2: T::BlockNumber = T::BlockNumber::from(2u32);29 let block2: BlockNumberFor<T> = 2u32.into();30 Inflation::<T>::on_initialize(block1); // Create Treasury account30 <Inflation<T> as Hooks>::on_initialize(block1); // Create Treasury account31 }: { Inflation::<T>::on_initialize(block2); } // Benchmark deposit_into_existing path31 }: { <Inflation<T> as Hooks>::on_initialize(block2); } // Benchmark deposit_into_existing path323233}33}3434pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth18use pallet_common::{18use pallet_common::{19 bench_init,19 bench_init,20 benchmarking::{20 benchmarking::{21 create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,21 create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,22 },22 },23 CommonCollectionOperations,23 CommonCollectionOperations,24};24};pallets/nonfungible/src/lib.rsdiffbeforeafterboth103};103};104pub use pallet::*;104pub use pallet::*;105use pallet_common::{105use pallet_common::{106 eth::collection_id_to_address, helpers::add_weight_to_post_info,106 Error as CommonError, Pallet as PalletCommon, Event as CommonEvent, CollectionHandle,107 weights::WeightInfo as CommonWeightInfo, CollectionHandle, Error as CommonError,107 eth::collection_id_to_address, SelfWeightOf as PalletCommonWeightOf,108 Event as CommonEvent, Pallet as PalletCommon, SelfWeightOf as PalletCommonWeightOf,108 weights::WeightInfo as CommonWeightInfo, helpers::add_weight_to_post_info,109};109};110use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};110use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};111use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};111use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};116use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};116use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};117use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};117use sp_std::{collections::btree_map::BTreeMap, vec, vec::Vec};118use up_data_structs::{118use up_data_structs::{119 AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,119 budget::Budget, mapping::TokenAddressMapping, AccessMode, AuxPropertyValue, CollectionId,120 mapping::TokenAddressMapping, budget::Budget, Property, PropertyKey, PropertyValue,120 CreateCollectionData, CreateNftExData, CustomDataLimit, PropertiesPermissionMap, Property,121 PropertyKeyPermission, PropertyScope, TokenChild, AuxPropertyValue, PropertiesPermissionMap,121 PropertyKey, PropertyKeyPermission, PropertyScope, PropertyValue, TokenChild, TokenId,122 TokenProperties as TokenPropertiesT,122 TokenProperties as TokenPropertiesT,123};123};124use weights::WeightInfo;124use weights::WeightInfo;pallets/refungible/src/benchmarking.rsdiffbeforeafterboth20use pallet_common::{20use pallet_common::{21 bench_init,21 bench_init,22 benchmarking::{22 benchmarking::{23 create_collection_raw, property_key, property_value, load_is_admin_and_property_permissions,23 create_collection_raw, load_is_admin_and_property_permissions, property_key, property_value,24 },24 },25};25};26use sp_std::prelude::*;26use sp_std::prelude::*;pallets/refungible/src/lib.rsdiffbeforeafterboth106 budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,106 budget::Budget, mapping::TokenAddressMapping, AccessMode, CollectionId, CreateCollectionData,107 CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,107 CreateRefungibleExMultipleOwners, PropertiesPermissionMap, Property, PropertyKey,108 PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,108 PropertyKeyPermission, PropertyScope, PropertyValue, TokenId, TokenOwnerError,109 TokenProperties as TokenPropertiesT, TrySetProperty, MAX_REFUNGIBLE_PIECES,109 TokenProperties as TokenPropertiesT, MAX_REFUNGIBLE_PIECES,110};110};111111112use crate::{erc::ERC721Events, erc_token::ERC20Events};112use crate::{erc::ERC721Events, erc_token::ERC20Events};runtime/opal/src/xcm_barrier.rsdiffbeforeafterboth15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.161617use frame_support::{match_types, traits::Everything};17use frame_support::{match_types, traits::Everything};18use xcm::latest::{Junctions::*, MultiLocation};18use staging_xcm::latest::{Junctions::*, MultiLocation};19use staging_xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit, AllowExplicitUnpaidExecutionFrom};19use staging_xcm_builder::{20 AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,21};202221match_types! {23match_types! {runtime/quartz/src/xcm_barrier.rsdiffbeforeafterboth17use frame_support::{match_types, traits::Everything};17use frame_support::{match_types, traits::Everything};18use staging_xcm::latest::{Junctions::*, MultiLocation};18use staging_xcm::latest::{Junctions::*, MultiLocation};19use staging_xcm_builder::{19use staging_xcm_builder::{20 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,20 AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,21 AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,21 AllowTopLevelPaidExecutionFrom, TakeWeightCredit,22};22};232324use crate::PolkadotXcm;24use crate::PolkadotXcm;runtime/unique/src/xcm_barrier.rsdiffbeforeafterboth17use frame_support::{match_types, traits::Everything};17use frame_support::{match_types, traits::Everything};18use staging_xcm::latest::{Junctions::*, MultiLocation};18use staging_xcm::latest::{Junctions::*, MultiLocation};19use staging_xcm_builder::{19use staging_xcm_builder::{20 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,20 AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,21 AllowTopLevelPaidExecutionFrom, AllowExplicitUnpaidExecutionFrom,21 AllowTopLevelPaidExecutionFrom, TakeWeightCredit,22};22};232324use crate::PolkadotXcm;24use crate::PolkadotXcm;