git.delta.rocks / unique-network / refs/commits / 9b836649cc42

difftreelog

fix unit tests

Trubnikov Sergey2023-05-10parent: #008dfe4.patch.diff
in: master

6 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12926,8 +12926,8 @@
  "frame-support",
  "frame-system",
  "pallet-balances",
+ "pallet-balances-adapter",
  "pallet-common",
- "pallet-configuration",
  "pallet-ethereum",
  "pallet-evm",
  "pallet-evm-coder-substrate",
@@ -12938,7 +12938,6 @@
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-unique",
- "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
modifiedpallets/balances-adapter/src/common.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -249,6 +249,7 @@
 
 	fn account_tokens(&self, account: <T>::CrossAccountId) -> Vec<TokenId> {
 		let balance = <T as Config>::Currency::total_balance(account.as_sub());
+		let balance: u128 = balance.into();
 		if balance != 0 {
 			vec![TokenId::default()]
 		} else {
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -76,7 +76,7 @@
 			Balance = Self::CurrencyBalance,
 		>;
 		/// Balance type of chain
-		type CurrencyBalance: Into<U256> + TryFrom<U256> + PartialEq<u128> + From<u128> + Into<u128>;
+		type CurrencyBalance: Into<U256> + TryFrom<U256> + TryFrom<u128> + Into<u128>;
 
 		/// Decimals of balance
 		type Decimals: Get<u8>;
@@ -144,7 +144,9 @@
 				<T as Config>::Currency::transfer(
 					from.as_sub(),
 					to.as_sub(),
-					amount.into(),
+					amount
+						.try_into()
+						.map_err(|_| sp_runtime::ArithmeticError::Overflow)?,
 					ExistenceRequirement::KeepAlive,
 				)?;
 
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
before · runtime/common/config/pallets/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21	runtime_common::{22		dispatch::CollectionDispatchT,23		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24		weights::CommonWeights,25		RelayChainBlockNumberProvider,26	},27	Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, RUNTIME_NAME, TOKEN_SYMBOL, DECIMALS,28	Balances,29};30use frame_support::traits::{ConstU32, ConstU64, Currency};31use up_common::{32	types::{AccountId, Balance, BlockNumber},33	constants::*,34};35use up_data_structs::{36	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},37};38use sp_arithmetic::Perbill;3940#[cfg(feature = "scheduler")]41pub mod scheduler;4243#[cfg(feature = "foreign-assets")]44pub mod foreign_asset;4546#[cfg(feature = "app-promotion")]47pub mod app_promotion;4849#[cfg(feature = "collator-selection")]50pub mod collator_selection;5152#[cfg(feature = "preimage")]53pub mod preimage;5455parameter_types! {56	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;57	pub const Decimals: u8 = DECIMALS;58	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();59	pub Name: String = RUNTIME_NAME.to_string();60	pub Symbol: String = TOKEN_SYMBOL.to_string();61}6263impl pallet_common::Config for Runtime {64	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;65	type RuntimeEvent = RuntimeEvent;66	type Currency = Balances;67	type CollectionCreationPrice = CollectionCreationPrice;68	type TreasuryAccountId = TreasuryAccountId;69	type CollectionDispatch = CollectionDispatchT<Self>;7071	type EvmTokenAddressMapping = EvmTokenAddressMapping;72	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;73	type ContractAddress = EvmCollectionHelpersAddress;74}7576impl pallet_structure::Config for Runtime {77	type RuntimeEvent = RuntimeEvent;78	type RuntimeCall = RuntimeCall;79	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;80}8182impl pallet_fungible::Config for Runtime {83	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;84}85impl pallet_refungible::Config for Runtime {86	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;87}88impl pallet_nonfungible::Config for Runtime {89	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;90}91impl pallet_balances_adapter::Config for Runtime {92	type Currency = Balances;93	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;94	type Decimals = Decimals;95	type Name = Name;96	type Symbol = Symbol;97	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;98}99100parameter_types! {101	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied102}103104/// Used for the pallet inflation105impl pallet_inflation::Config for Runtime {106	type Currency = Balances;107	type TreasuryAccountId = TreasuryAccountId;108	type InflationBlockInterval = InflationBlockInterval;109	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;110}111112impl pallet_unique::Config for Runtime {113	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;114	type CommonWeightInfo = CommonWeights<Self>;115	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;116}117118parameter_types! {119	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);120	pub const MaxCollators: u32 = MAX_COLLATORS;121	pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;122	pub const SessionPeriod: BlockNumber = SESSION_LENGTH;123	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;124}125126impl pallet_configuration::Config for Runtime {127	type RuntimeEvent = RuntimeEvent;128	type Currency = Balances;129	type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;130	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;131	type DefaultCollatorSelectionMaxCollators = MaxCollators;132	type DefaultCollatorSelectionKickThreshold = SessionPeriod;133	type DefaultCollatorSelectionLicenseBond = LicenseBond;134	type MaxXcmAllowedLocations = ConstU32<16>;135	type AppPromotionDailyRate = AppPromotionDailyRate;136	type DayRelayBlocks = DayRelayBlocks;137	type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;138}139140impl pallet_maintenance::Config for Runtime {141	type RuntimeEvent = RuntimeEvent;142	type RuntimeOrigin = RuntimeOrigin;143	type RuntimeCall = RuntimeCall;144	#[cfg(feature = "preimage")]145	type Preimages = crate::Preimage;146	#[cfg(not(feature = "preimage"))]147	type Preimages = ();148	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;149}
modifiedruntime/tests/Cargo.tomldiffbeforeafterboth
--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -26,6 +26,7 @@
 pallet-ethereum = { workspace = true }
 pallet-evm = { workspace = true }
 
+pallet-balances-adapter = { workspace = true }
 pallet-common = { workspace = true }
 pallet-fungible = { workspace = true }
 pallet-nonfungible = { workspace = true }
@@ -41,5 +42,3 @@
 evm-coder = { workspace = true }
 up-sponsorship = { workspace = true }
 xcm = { workspace = true }
-pallet-xcm = { workspace = true }
-pallet-configuration = { workspace = true }
modifiedruntime/tests/src/lib.rsdiffbeforeafterboth
--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -19,7 +19,7 @@
 use sp_core::{H160, H256, U256};
 use frame_support::{
 	parameter_types,
-	traits::{Everything, ConstU32, ConstU64},
+	traits::{Everything, ConstU32, ConstU64, Currency},
 	weights::IdentityFee,
 	pallet_prelude::Weight,
 };
@@ -266,6 +266,19 @@
 impl pallet_nonfungible::Config for Test {
 	type WeightInfo = ();
 }
+parameter_types! {
+	pub const Decimals: u8 = 18;
+	pub Name: String = "Test".to_string();
+	pub Symbol: String = "TST".to_string();
+}
+impl pallet_balances_adapter::Config for Test {
+	type Currency = Balances;
+	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;
+	type Decimals = Decimals;
+	type Name = Name;
+	type Symbol = Symbol;
+	type WeightInfo = ();
+}
 
 parameter_types! {
 	// 0x6c4e9fe1ae37a41e93cee429e8e1881abdcbb54f