Refactor liquidity tests for future runtime upgrades

packages/kusama/src/__snapshots__/assetHubKusama.accounts.e2e.test.ts.snap

@@ -191,6 +191,8 @@ exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction erro
 ]
 `;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via referendum submission > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via referendum submission > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: deposit=referendum submission"`;
 
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and vested transfer, triggered via multisig creation > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: lock=vested transfer"`;
@@ -199,10 +201,16 @@ exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction erro
 
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and vested transfer, triggered via referendum submission > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: lock=vested transfer, deposit=referendum submission"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via multisig creation > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via multisig creation > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=nomination pool"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via proxy addition > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via proxy addition > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=nomination pool"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via referendum submission > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and manual lock, triggered via referendum submission > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=nomination pool, deposit=referendum submission"`;
 
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and vested transfer, triggered via multisig creation > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=nomination pool, lock=vested transfer"`;
@@ -211,10 +219,29 @@ exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction erro
 
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via nomination pool and vested transfer, triggered via referendum submission > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=nomination pool, lock=vested transfer, deposit=referendum submission"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via multisig creation > deposit action success events 1`] = `
+[
+  {
+    "data": {
+      "amount": "(rounded 6700000000)",
+      "who": "D8ew585BL5H1ALhn4kmJoxhgqcgKDZLPc6xunJNv4mmrBns",
+    },
+    "method": "Reserved",
+    "section": "balances",
+  },
+]
+`;
+
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via multisig creation > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via multisig creation > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=staking bond"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via proxy addition > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via proxy addition > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=staking bond"`;
 
+exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via referendum submission > liquidity restricted action events 1`] = `[]`;
+
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and manual lock, triggered via referendum submission > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=staking bond, deposit=referendum submission"`;
 
 exports[`Kusama Asset Hub Accounts > currency tests > liquidity restriction error: funds locked via staking bond and vested transfer, triggered via multisig creation > liquidity restriction test skipped 1`] = `"Skipping test - required pallets not available: reserve=staking bond, lock=vested transfer"`;

packages/kusama/src/__snapshots__/coretimeKusama.accounts.e2e.test.ts.snap

@@ -141,6 +141,8 @@ exports[`Kusama Coretime Accounts > \`transfer_all\` > transfer all with keepAli
 ]
 `;
 
+exports[`Kusama Coretime Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via multisig creation > deposit action success events 1`] = `[]`;
+
 exports[`Kusama Coretime Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via multisig creation > liquidity restricted action events 1`] = `
 [
   {
@@ -166,6 +168,8 @@ exports[`Kusama Coretime Accounts > currency tests > liquidity restriction error
 ]
 `;
 
+exports[`Kusama Coretime Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via proxy addition > deposit action success events 1`] = `[]`;
+
 exports[`Kusama Coretime Accounts > currency tests > liquidity restriction error: funds locked via manual reserve and manual lock, triggered via proxy addition > liquidity restricted action events 1`] = `
 [
   {

packages/kusama/src/assetHubKusama.accounts.e2e.test.ts

@@ -1,16 +1,32 @@
 import { assetHubKusama, kusama } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import {
+  accountsE2ETests,
+  createAccountsConfig,
+  createDefaultDepositActions,
+  createDefaultLockActions,
+  createDefaultReserveActions,
+  registerTestTree,
+  type TestConfig,
+} from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    assetHubKusama,
-    {
-      testSuiteName: 'Kusama Asset Hub Accounts',
-      addressEncoding: 2,
-      blockProvider: 'NonLocal',
-      asyncBacking: 'Enabled',
-      chainEd: 'LowEd',
-    },
-    kusama,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Kusama Asset Hub Accounts',
+  addressEncoding: 2,
+  blockProvider: 'NonLocal',
+  asyncBacking: 'Enabled',
+  chainEd: 'LowEd',
+}
+
+// When testing liquidity restrictions on Asset Hubs, to simulate frozen funds, vesting is skipped due to AHM.
+const lockActions = createDefaultLockActions().filter((action) => !action.name.includes('vest'))
+
+const accountsCfg = createAccountsConfig({
+  relayChain: kusama,
+  actions: {
+    reserveActions: createDefaultReserveActions(),
+    lockActions,
+    depositActions: createDefaultDepositActions(),
+  },
+})
+
+registerTestTree(accountsE2ETests(assetHubKusama, testCfg, accountsCfg))

packages/kusama/src/bridgeHubKusama.accounts.e2e.test.ts

@@ -1,15 +1,15 @@
 import { bridgeHubKusama, kusama } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    bridgeHubKusama,
-    {
-      testSuiteName: 'Kusama Bridge Hub Accounts',
-      addressEncoding: 2,
-      blockProvider: 'Local',
-      chainEd: 'LowEd',
-    },
-    kusama,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Kusama Bridge Hub Accounts',
+  addressEncoding: 2,
+  blockProvider: 'Local',
+  chainEd: 'LowEd',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: kusama,
+})
+
+registerTestTree(accountsE2ETests(bridgeHubKusama, testCfg, accountsCfg))

packages/kusama/src/coretimeKusama.accounts.e2e.test.ts

@@ -1,15 +1,15 @@
 import { coretimeKusama, kusama } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    coretimeKusama,
-    {
-      testSuiteName: 'Kusama Coretime Accounts',
-      addressEncoding: 2,
-      blockProvider: 'Local',
-      chainEd: 'LowEd',
-    },
-    kusama,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Kusama Coretime Accounts',
+  addressEncoding: 2,
+  blockProvider: 'Local',
+  chainEd: 'LowEd',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: kusama,
+})
+
+registerTestTree(accountsE2ETests(coretimeKusama, testCfg, accountsCfg))

packages/kusama/src/peopleKusama.accounts.e2e.test.ts

@@ -1,15 +1,15 @@
 import { kusama, peopleKusama } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    peopleKusama,
-    {
-      testSuiteName: 'Kusama People Chain Accounts',
-      addressEncoding: 2,
-      blockProvider: 'Local',
-      chainEd: 'LowEd',
-    },
-    kusama,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Kusama People Chain Accounts',
+  addressEncoding: 2,
+  blockProvider: 'Local',
+  chainEd: 'LowEd',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: kusama,
+})
+
+registerTestTree(accountsE2ETests(peopleKusama, testCfg, accountsCfg))

packages/polkadot/src/assetHubPolkadot.accounts.e2e.test.ts

@@ -1,16 +1,32 @@
 import { assetHubPolkadot, polkadot } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import {
+  accountsE2ETests,
+  createAccountsConfig,
+  createDefaultDepositActions,
+  createDefaultLockActions,
+  createDefaultReserveActions,
+  registerTestTree,
+  type TestConfig,
+} from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    assetHubPolkadot,
-    {
-      testSuiteName: 'Polkadot Asset Hub Accounts',
-      addressEncoding: 0,
-      blockProvider: 'NonLocal',
-      asyncBacking: 'Enabled',
-      chainEd: 'Normal',
-    },
-    polkadot,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Polkadot Asset Hub Accounts',
+  addressEncoding: 0,
+  blockProvider: 'NonLocal',
+  asyncBacking: 'Enabled',
+  chainEd: 'Normal',
+}
+
+// When testing liquidity restrictions on Asset Hubs, to simulate frozen funds, vesting is skipped due to AHM.
+const lockActions = createDefaultLockActions().filter((action) => !action.name.includes('vest'))
+
+const accountsCfg = createAccountsConfig({
+  relayChain: polkadot,
+  actions: {
+    reserveActions: createDefaultReserveActions(),
+    lockActions,
+    depositActions: createDefaultDepositActions(),
+  },
+})
+
+registerTestTree(accountsE2ETests(assetHubPolkadot, testCfg, accountsCfg))

packages/polkadot/src/bridgeHubPolkadot.accounts.e2e.test.ts

@@ -1,15 +1,15 @@
 import { bridgeHubPolkadot, polkadot } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    bridgeHubPolkadot,
-    {
-      testSuiteName: 'Polkadot Bridge Hub Accounts',
-      blockProvider: 'Local',
-      addressEncoding: 0,
-      chainEd: 'Normal',
-    },
-    polkadot,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Polkadot Bridge Hub Accounts',
+  blockProvider: 'Local',
+  addressEncoding: 0,
+  chainEd: 'Normal',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: polkadot,
+})
+
+registerTestTree(accountsE2ETests(bridgeHubPolkadot, testCfg, accountsCfg))

packages/polkadot/src/coretimePolkadot.accounts.e2e.test.ts

@@ -1,16 +1,16 @@
 import { coretimePolkadot, polkadot } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    coretimePolkadot,
-    {
-      testSuiteName: 'Polkadot Coretime Accounts',
-      addressEncoding: 0,
-      blockProvider: 'Local',
-      asyncBacking: 'Enabled',
-      chainEd: 'Normal',
-    },
-    polkadot,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Polkadot Coretime Accounts',
+  addressEncoding: 0,
+  blockProvider: 'Local',
+  asyncBacking: 'Enabled',
+  chainEd: 'Normal',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: polkadot,
+})
+
+registerTestTree(accountsE2ETests(coretimePolkadot, testCfg, accountsCfg))

packages/polkadot/src/peoplePolkadot.accounts.e2e.test.ts

@@ -1,15 +1,15 @@
 import { peoplePolkadot, polkadot } from '@e2e-test/networks/chains'
-import { accountsE2ETests, registerTestTree } from '@e2e-test/shared'
+import { accountsE2ETests, createAccountsConfig, registerTestTree, type TestConfig } from '@e2e-test/shared'
 
-registerTestTree(
-  accountsE2ETests(
-    peoplePolkadot,
-    {
-      testSuiteName: 'Polkadot People Chain Accounts',
-      addressEncoding: 0,
-      blockProvider: 'Local',
-      chainEd: 'Normal',
-    },
-    polkadot,
-  ),
-)
+const testCfg: TestConfig = {
+  testSuiteName: 'Polkadot People Chain Accounts',
+  addressEncoding: 0,
+  blockProvider: 'Local',
+  chainEd: 'Normal',
+}
+
+const accountsCfg = createAccountsConfig({
+  relayChain: polkadot,
+})
+
+registerTestTree(accountsE2ETests(peoplePolkadot, testCfg, accountsCfg))