git.delta.rocks / unique-network / refs/commits / 50312582bbed

difftreelog

Fix feature foreign_assets misspels

Ilja Khabarov2022-08-22parent: #55191cf.patch.diff
in: master

5 files changed

modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
40#[cfg(feature = "scheduler")]40#[cfg(feature = "scheduler")]
41pub mod scheduler;41pub mod scheduler;
4242
43#[cfg(feature = "foreign-asset")]43#[cfg(feature = "foreign-assets")]
44pub mod foreign_asset;44pub mod foreign_asset;
4545
46parameter_types! {46parameter_types! {
modifiedruntime/common/config/xcm.rsdiffbeforeafterboth
40 FixedWeightBounds, FungiblesAdapter, LocationInverter, NativeAsset, ParentAsSuperuser, RelayChainAsNative,40 FixedWeightBounds, FungiblesAdapter, LocationInverter, NativeAsset, ParentAsSuperuser, RelayChainAsNative,
41 SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,41 SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
42 SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, ParentIsPreset,42 SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, ParentIsPreset,
43 ConvertedConcreteAssetId
43};44};
44use xcm_executor::{Config, XcmExecutor, Assets};45use xcm_executor::{Config, XcmExecutor, Assets};
45use xcm_executor::traits::{Convert as ConvertXcm, MatchesFungible, WeightTrader, FilterAssetLocation};46use xcm_executor::traits::{Convert as ConvertXcm, JustTry, MatchesFungible, WeightTrader, FilterAssetLocation};
46use pallet_foreing_assets::{47use pallet_foreing_assets::{
47 AssetIds, AssetIdMapping, XcmForeignAssetIdMapping, CurrencyId, NativeCurrency,48 AssetIds, AssetIdMapping, XcmForeignAssetIdMapping, CurrencyId, NativeCurrency,
48 UsingAnyCurrencyComponents, TryAsForeing, ForeignAssetId,49 UsingAnyCurrencyComponents, TryAsForeing, ForeignAssetId,
356/// Means for transacting assets on this chain.357/// Means for transacting assets on this chain.
357#[cfg(feature = "foreign-assets")]358#[cfg(feature = "foreign-assets")]
358pub type AssetTransactors = FungiblesTransactor;359pub type AssetTransactors = FungiblesTransactor;
359#[cfg(not(feature = "foreign-assets"))]360
360pub type AssetTransactors = LocalAssetTransactor;361//#[cfg(not(feature = "foreign-assets"))]
362//pub type AssetTransactors = LocalAssetTransactor;
361363
362#[cfg(feature = "foreign-assets")]364#[cfg(feature = "foreign-assets")]
363pub struct AllAsset;365pub struct AllAsset;
370372
371#[cfg(feature = "foreign-assets")]373#[cfg(feature = "foreign-assets")]
372pub type IsReserve = AllAsset;374pub type IsReserve = AllAsset;
373#[cfg(not(feature = "foreign-assets"))]375//#[cfg(not(feature = "foreign-assets"))]
374pub type IsReserve = NativeAsset;376//pub type IsReserve = NativeAsset;
375377
376#[cfg(feature = "foreign-assets")]378#[cfg(feature = "foreign-assets")]
377type Trader<T> =379type Trader<T> =
378 UsingAnyCurrencyComponents<380 UsingAnyCurrencyComponents<
379 pallet_configuration::WeightToFee<T, Balance>,381 pallet_configuration::WeightToFee<T, Balance>,
380 RelayLocation, AccountId, Balances, ()>;382 RelayLocation, AccountId, Balances, ()>;
381#[cfg(not(feature = "foreign-assets"))]383/*
382type Trader<T> = UsingOnlySelfCurrencyComponents<384#[cfg(not(feature = "foreign-assets"))]
383 pallet_configuration::WeightToFee<T, Balance>,385type Trader<T> = UsingOnlySelfCurrencyComponents<
384 RelayLocation,386 pallet_configuration::WeightToFee<T, Balance>,
385 AccountId,387 RelayLocation,
386 Balances,388 AccountId,
387 (),389 Balances,
388>;390 (),
391>;
392*/
389393
390pub struct XcmConfig<T>(PhantomData<T>);394pub struct XcmConfig<T>(PhantomData<T>);
391impl<T> Config for XcmConfig<T>395impl<T> Config for XcmConfig<T>
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
126 "pallet-foreing-assets/std"126 "pallet-foreing-assets/std"
127]127]
128limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']128limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
129opal-runtime = ['refungible', 'scheduler', 'rmrk', 'foreign-asset']129opal-runtime = ['refungible', 'scheduler', 'rmrk', 'foreign-assets']
130130
131refungible = []131refungible = []
132scheduler = []132scheduler = []
133rmrk = []133rmrk = []
134foreign-asset = []134foreign-assets = []
135135
136################################################################################136################################################################################
137# Substrate Dependencies137# Substrate Dependencies
modifiedtests/package.jsondiffbeforeafterboth
75 "testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",75 "testScheduler": "mocha --timeout 9999999 -r ts-node/register ./**/scheduler.test.ts",
76 "testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",76 "testSchedulingEVM": "mocha --timeout 9999999 -r ts-node/register ./**/eth/scheduling.test.ts",
77 "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",77 "testXcmTransfer": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",
78 "testXcmTransferAcala": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferAcala.test.ts",
79 "testXcmTransferKarura": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferKarura.test.ts",
80 "testXcmTransferStatemine": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferStatemine.test.ts",
81 "testXcmTransferMoonriver": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransferMoonriver.test.ts",
78 "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",82 "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
79 "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",83 "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
80 "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",84 "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
modifiedtests/src/xcmTransferStatemine.test.tsdiffbeforeafterboth
30const expect = chai.expect;30const expect = chai.expect;
3131
32const RELAY_PORT = '9844';32const RELAY_PORT = '9844';
33const UNIQUE_CHAIN = 5000;33const UNIQUE_CHAIN = 2037;
34const UNIQUE_PORT = '9944';34const UNIQUE_PORT = '9944';
35const STATEMINE_CHAIN = 1000;35const STATEMINE_CHAIN = 1000;
36const STATEMINE_PORT = '9946';36const STATEMINE_PORT = '9946';
87 const result3 = getGenericResult(events3);87 const result3 = getGenericResult(events3);
88 expect(result3.success).to.be.true;88 expect(result3.success).to.be.true;
8989
90 // funding parachain sovereing account (Parachain: 5000)90 // funding parachain sovereing account (Parachain: 2037)
91 //const parachainSovereingAccount = '0x70617261f5070000000000000000000000000000000000000000000000000000';
91 const parachainSovereingAccount = '0x7369626c88130000000000000000000000000000000000000000000000000000';92 const parachainSovereingAccount = '0x7369626cf5070000000000000000000000000000000000000000000000000000';
92 const tx4 = api.tx.balances.transfer(parachainSovereingAccount, fundingAmount);93 const tx4 = api.tx.balances.transfer(parachainSovereingAccount, fundingAmount);
93 const events4 = await submitTransactionAsync(bob, tx4);94 const events4 = await submitTransactionAsync(bob, tx4);
94 const result4 = getGenericResult(events4);95 const result4 = getGenericResult(events4);
265 }, uniqueApiOptions);266 }, uniqueApiOptions);
266 });267 });
267268
268 it('Should connect and send USDT from Unique to Statemine back', async () => {269 it.skip('Should connect and send USDT from Unique to Statemine back', async () => {
269 let balanceBefore: bigint;270 let balanceBefore: bigint;
270 const uniqueApiOptions: ApiOptions = {271 const uniqueApiOptions: ApiOptions = {
271 provider: new WsProvider('ws://127.0.0.1:' + UNIQUE_PORT),272 provider: new WsProvider('ws://127.0.0.1:' + UNIQUE_PORT),