fix into_account

asset-registry/src/mock/para.rs

@@ -156,7 +156,7 @@ pub type XcmRouter = ParachainXcmRouter<ParachainInfo>;
 pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<Everything>);
 
 parameter_types! {
-	pub TreasuryAccount: AccountId = PalletId(*b"Treasury").into_account();
+	pub TreasuryAccount: AccountId = PalletId(*b"Treasury").into_account_truncating();
 }
 
 pub struct ToTreasury;

asset-registry/src/tests.rs

@@ -7,26 +7,23 @@ use frame_support::{assert_noop, assert_ok};
 use mock::*;
 use orml_traits::MultiCurrency;
 use polkadot_parachain::primitives::Sibling;
-use sp_runtime::AccountId32;
+use sp_runtime::{traits::AccountIdConversion, AccountId32};
 use xcm_simulator::TestExt;
 
 fn treasury_account() -> AccountId32 {
 	TreasuryAccount::get()
 }
 
 fn sibling_a_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(1).into_account()
+	Sibling::from(1).into_sub_account_truncating(&())
 }
 
 fn sibling_b_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(2).into_account()
+	Sibling::from(2).into_sub_account_truncating(&())
 }
 
 fn sibling_c_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(3).into_account()
+	Sibling::from(3).into_sub_account_truncating(&())
 }
 
 // Not used in any unit tests, but it's super helpful for debugging. Let's

currencies/src/mock.rs

@@ -70,7 +70,7 @@ parameter_type_with_key! {
 }
 
 parameter_types! {
-	pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account();
+	pub DustAccount: AccountId = PalletId(*b"orml/dst").into_account_truncating();
 }
 
 impl orml_tokens::Config for Runtime {

tokens/src/mock.rs

@@ -221,7 +221,7 @@ parameter_type_with_key! {
 }
 
 parameter_types! {
-	pub DustReceiver: AccountId = PalletId(*b"orml/dst").into_account();
+	pub DustReceiver: AccountId = PalletId(*b"orml/dst").into_account_truncating();
 }
 
 impl Config for Runtime {

xtokens/src/tests.rs

@@ -6,40 +6,36 @@ use cumulus_primitives_core::ParaId;
 use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency};
 use mock::*;
 use orml_traits::{ConcreteFungibleAsset, MultiCurrency};
-use polkadot_parachain::primitives::{AccountIdConversion, Sibling};
-use sp_runtime::AccountId32;
+use polkadot_parachain::primitives::{Sibling};
+use sp_runtime::{traits::AccountIdConversion, AccountId32};
 use xcm_simulator::TestExt;
 
 fn para_a_account() -> AccountId32 {
-	ParaId::from(1).into_account()
+	ParaId::from(1).into_sub_account_truncating(&())
 }
 
 fn para_b_account() -> AccountId32 {
-	ParaId::from(2).into_account()
+	ParaId::from(2).into_sub_account_truncating(&())
 }
 
 fn para_d_account() -> AccountId32 {
-	ParaId::from(4).into_account()
+	ParaId::from(4).into_sub_account_truncating(&())
 }
 
 fn sibling_a_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(1).into_account()
+	Sibling::from(1).into_sub_account_truncating(&())
 }
 
 fn sibling_b_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(2).into_account()
+	Sibling::from(2).into_sub_account_truncating(&())
 }
 
 fn sibling_c_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(3).into_account()
+	Sibling::from(3).into_sub_account_truncating(&())
 }
 
 fn sibling_d_account() -> AccountId32 {
-	use sp_runtime::traits::AccountIdConversion;
-	Sibling::from(4).into_account()
+	Sibling::from(4).into_sub_account_truncating(&())
 }
 
 // Not used in any unit tests, but it's super helpful for debugging. Let's