difftreelog
fix unit tests
in: master
6 files changed
Cargo.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",
pallets/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 {
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth1// #![doc = include_str!("../README.md")]2#![cfg_attr(not(feature = "std"), no_std)]34extern crate alloc;5use core::ops::Deref;67use frame_support::sp_runtime::DispatchResult;8use pallet_evm_coder_substrate::{WithRecorder, SubstrateRecorder};9pub use pallet::*;1011pub mod common;12pub mod erc;1314pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;1516const NATIVE_FUNGIBLE_COLLECTION_ID: up_data_structs::CollectionId =17 up_data_structs::CollectionId(0);1819/// Handle for native fungible collection20pub struct NativeFungibleHandle<T: Config>(SubstrateRecorder<T>);21impl<T: Config> NativeFungibleHandle<T> {22 /// Creates a handle23 pub fn new() -> NativeFungibleHandle<T> {24 Self(SubstrateRecorder::new(u64::MAX))25 }2627 /// Check if the collection is internal28 pub fn check_is_internal(&self) -> DispatchResult {29 Ok(())30 }31}3233impl<T: Config> WithRecorder<T> for NativeFungibleHandle<T> {34 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {35 &self.036 }37 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {38 self.039 }40}4142impl<T: Config> Deref for NativeFungibleHandle<T> {43 type Target = SubstrateRecorder<T>;4445 fn deref(&self) -> &Self::Target {46 &self.047 }48}49#[frame_support::pallet]50pub mod pallet {51 use super::*;52 use alloc::string::String;53 use frame_support::{54 dispatch::PostDispatchInfo,55 ensure,56 pallet_prelude::{DispatchResultWithPostInfo, Pays},57 traits::{Currency, ExistenceRequirement, Get},58 };59 use pallet_balances::WeightInfo;60 use pallet_common::{erc::CrossAccountId, Error as CommonError, Pallet as PalletCommon};61 use pallet_structure::Pallet as PalletStructure;62 use sp_core::U256;63 use sp_runtime::DispatchError;64 use up_data_structs::{budget::Budget, mapping::TokenAddressMapping, TokenId};6566 #[pallet::config]67 pub trait Config:68 frame_system::Config69 + pallet_evm_coder_substrate::Config70 + pallet_common::Config71 + pallet_structure::Config72 {73 /// Currency from `pallet_balances`74 type Currency: frame_support::traits::Currency<75 Self::AccountId,76 Balance = Self::CurrencyBalance,77 >;78 /// Balance type of chain79 type CurrencyBalance: Into<U256> + TryFrom<U256> + PartialEq<u128> + From<u128> + Into<u128>;8081 /// Decimals of balance82 type Decimals: Get<u8>;83 /// Collection name84 type Name: Get<String>;85 /// Collection symbol86 type Symbol: Get<String>;8788 /// Weight information89 type WeightInfo: WeightInfo;90 }91 #[pallet::pallet]92 pub struct Pallet<T>(_);9394 impl<T: Config> Pallet<T> {95 /// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.96 /// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.97 ///98 /// - `collection`: Collection that contains the token.99 /// - `spender`: CrossAccountId who has the allowance rights.100 /// - `from`: The owner of the tokens who sets the allowance.101 /// - `amount`: Amount of tokens by which the allowance sholud be reduced.102 fn check_allowed(103 spender: &T::CrossAccountId,104 from: &T::CrossAccountId,105 nesting_budget: &dyn Budget,106 ) -> Result<u128, DispatchError> {107 if let Some((collection_id, token_id)) =108 T::CrossTokenAddressMapping::address_to_token(from)109 {110 ensure!(111 <PalletStructure<T>>::check_indirectly_owned(112 spender.clone(),113 collection_id,114 token_id,115 None,116 nesting_budget117 )?,118 <CommonError<T>>::ApprovedValueTooLow,119 );120 } else if !spender.conv_eq(from) {121 return Ok(0);122 }123124 Ok(<T as Config>::Currency::free_balance(from.as_sub()).into())125 }126127 /// Transfers the specified amount of tokens. Will check that128 /// the transfer is allowed for the token.129 ///130 /// - `from`: Owner of tokens to transfer.131 /// - `to`: Recepient of transfered tokens.132 /// - `amount`: Amount of tokens to transfer.133 /// - `collection`: Collection that contains the token134 pub fn transfer(135 _collection: &NativeFungibleHandle<T>,136 from: &T::CrossAccountId,137 to: &T::CrossAccountId,138 amount: u128,139 nesting_budget: &dyn Budget,140 ) -> DispatchResultWithPostInfo {141 <PalletCommon<T>>::ensure_correct_receiver(to)?;142143 if from != to && amount != 0 {144 <T as Config>::Currency::transfer(145 from.as_sub(),146 to.as_sub(),147 amount.into(),148 ExistenceRequirement::KeepAlive,149 )?;150151 <PalletStructure<T>>::nest_if_sent_to_token(152 from.clone(),153 to,154 NATIVE_FUNGIBLE_COLLECTION_ID,155 TokenId::default(),156 nesting_budget,157 )?;158159 let balance_from: u128 =160 <T as Config>::Currency::free_balance(from.as_sub()).into();161 if balance_from == 0 {162 <PalletStructure<T>>::unnest_if_nested(163 from,164 NATIVE_FUNGIBLE_COLLECTION_ID,165 TokenId::default(),166 );167 }168 };169170 Ok(PostDispatchInfo {171 actual_weight: Some(<SelfWeightOf<T>>::transfer()),172 pays_fee: Pays::Yes,173 })174 }175176 pub fn transfer_from(177 collection: &NativeFungibleHandle<T>,178 spender: &T::CrossAccountId,179 from: &T::CrossAccountId,180 to: &T::CrossAccountId,181 amount: u128,182 nesting_budget: &dyn Budget,183 ) -> DispatchResultWithPostInfo {184 let allowance = Self::check_allowed(spender, from, nesting_budget)?;185 if allowance < amount {186 return Err(<CommonError<T>>::ApprovedValueTooLow.into());187 }188 Self::transfer(collection, from, to, amount, nesting_budget)189 }190 }191}runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -54,10 +54,7 @@
parameter_types! {
pub const CollectionCreationPrice: Balance = 2 * UNIQUE;
- pub const Decimals: u8 = DECIMALS;
pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();
- pub Name: String = RUNTIME_NAME.to_string();
- pub Symbol: String = TOKEN_SYMBOL.to_string();
}
impl pallet_common::Config for Runtime {
@@ -88,6 +85,12 @@
impl pallet_nonfungible::Config for Runtime {
type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
}
+
+parameter_types! {
+ pub const Decimals: u8 = DECIMALS;
+ pub Name: String = RUNTIME_NAME.to_string();
+ pub Symbol: String = TOKEN_SYMBOL.to_string();
+}
impl pallet_balances_adapter::Config for Runtime {
type Currency = Balances;
type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;
runtime/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 }
runtime/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