From 68bf2bb2d7848b0a89a59f52cf029300644e1bc4 Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <dshiposha@usetech.com>
Date: Fri, 14 Oct 2022 14:14:45 +0000
Subject: [PATCH] fix: use config for xcm urls


---
--- a/tests/src/config.ts
+++ b/tests/src/config.ts
@@ -19,6 +19,12 @@
 const config = {
   substrateUrl: process.env.substrateUrl || 'ws://127.0.0.1:9944',
   frontierUrl: process.env.frontierUrl || 'http://127.0.0.1:9933',
+  relayUrl: process.env.relayUrl || 'ws://127.0.0.1:9844',
+  acalaUrl: process.env.acalaUrl || 'ws://127.0.0.1:9946',
+  karuraUrl: process.env.acalaUrl || 'ws://127.0.0.1:9946',
+  moonbeamUrl: process.env.moonbeamUrl || 'ws://127.0.0.1:9947',
+  moonriverUrl: process.env.moonbeamUrl || 'ws://127.0.0.1:9947',
+  westmintUrl: process.env.westmintUrl || 'ws://127.0.0.1:9948',
 };
 
-export default config;
\ No newline at end of file
+export default config;
--- a/tests/src/xcm/xcmOpal.test.ts
+++ b/tests/src/xcm/xcmOpal.test.ts
@@ -15,16 +15,14 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
+import config from '../config';
 import {itSub, expect, describeXcm, usingPlaygrounds, usingWestmintPlaygrounds, usingRelayPlaygrounds} from '../util/playgrounds';
 
 const STATEMINE_CHAIN = 1000;
 const UNIQUE_CHAIN = 2095;
-
-const RELAY_PORT = '9844';
-const STATEMINE_PORT = '9948';
 
-const relayUrl = 'ws://127.0.0.1:' + RELAY_PORT;
-const statemineUrl = 'ws://127.0.0.1:' + STATEMINE_PORT;
+const relayUrl = config.relayUrl;
+const westmintUrl = config.westmintUrl;
 
 const STATEMINE_PALLET_INSTANCE = 50;
 const ASSET_ID = 100;
@@ -65,7 +63,7 @@
       bob = privateKey('//Bob'); // funds donor
     });
 
-    await usingWestmintPlaygrounds(statemineUrl, async (helper) => {
+    await usingWestmintPlaygrounds(westmintUrl, async (helper) => {
       // 350.00 (three hundred fifty) DOT
       const fundingAmount = 3_500_000_000_000n; 
 
@@ -157,7 +155,7 @@
   });
 
   itSub('Should connect and send USDT from Westmint to Opal', async ({helper}) => {
-    await usingWestmintPlaygrounds(statemineUrl, async (helper) => {
+    await usingWestmintPlaygrounds(westmintUrl, async (helper) => {
       const dest = {
         V1: {
           parents: 1,
@@ -286,7 +284,7 @@
     balanceOpalFinal = await helper.balance.getSubstrate(alice.address);
     expect(balanceOpalAfter > balanceOpalFinal).to.be.true;
 
-    await usingWestmintPlaygrounds(statemineUrl, async (helper) => {
+    await usingWestmintPlaygrounds(westmintUrl, async (helper) => {
       await helper.wait.newBlocks(3);
       
       // The USDT token never paid fees. Its amount not changed from begin value.
--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -16,20 +16,17 @@
 
 import {IKeyringPair} from '@polkadot/types/types';
 import {blake2AsHex} from '@polkadot/util-crypto';
+import config from '../config';
 import {XcmV2TraitsOutcome, XcmV2TraitsError} from '../interfaces';
 import {itSub, expect, describeXcm, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds} from '../util/playgrounds';
 
 const QUARTZ_CHAIN = 2095;
 const KARURA_CHAIN = 2000;
 const MOONRIVER_CHAIN = 2023;
-
-const RELAY_PORT = 9844;
-const KARURA_PORT = 9946;
-const MOONRIVER_PORT = 9947;
 
-const relayUrl = 'ws://127.0.0.1:' + RELAY_PORT;
-const karuraUrl = 'ws://127.0.0.1:' + KARURA_PORT;
-const moonriverUrl = 'ws://127.0.0.1:' + MOONRIVER_PORT;
+const relayUrl = config.relayUrl;
+const karuraUrl = config.karuraUrl;
+const moonriverUrl = config.moonriverUrl;
 
 const KARURA_DECIMALS = 12;
 
--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -16,20 +16,17 @@
 
 import {IKeyringPair} from '@polkadot/types/types';
 import {blake2AsHex} from '@polkadot/util-crypto';
+import config from '../config';
 import {XcmV2TraitsError, XcmV2TraitsOutcome} from '../interfaces';
 import {itSub, expect, describeXcm, usingPlaygrounds, usingAcalaPlaygrounds, usingRelayPlaygrounds, usingMoonbeamPlaygrounds} from '../util/playgrounds';
 
 const UNIQUE_CHAIN = 2037;
 const ACALA_CHAIN = 2000;
 const MOONBEAM_CHAIN = 2004;
-
-const RELAY_PORT = 9844;
-const ACALA_PORT = 9946;
-const MOONBEAM_PORT = 9947;
 
-const relayUrl = 'ws://127.0.0.1:' + RELAY_PORT;
-const acalaUrl = 'ws://127.0.0.1:' + ACALA_PORT;
-const moonbeamUrl = 'ws://127.0.0.1:' + MOONBEAM_PORT;
+const relayUrl = config.relayUrl;
+const acalaUrl = config.acalaUrl;
+const moonbeamUrl = config.moonbeamUrl;
 
 const ACALA_DECIMALS = 12;
 

-- 
gitstuff