Add tests for PreImage (continued)

Add additional tests which verify PreImage behavior:

This is a continuation of the PR: #470.
Also address outstanding comments from the original PR.

Author: andreitrand

packages/shared/src/helpers/index.ts

@@ -7,7 +7,7 @@ import type { ApiPromise } from '@polkadot/api'
 import { decodeAddress, encodeAddress } from '@polkadot/keyring'
 import type { KeyringPair } from '@polkadot/keyring/types'
 import type { EventRecord } from '@polkadot/types/interfaces'
-import type { PalletStakingValidatorPrefs } from '@polkadot/types/lookup'
+import type { FrameSystemAccountInfo, PalletStakingValidatorPrefs } from '@polkadot/types/lookup'
 import type { IsEvent } from '@polkadot/types/metadata/decorate/types'
 import type { AnyTuple, Codec, IEvent } from '@polkadot/types/types'
 import type { HexString } from '@polkadot/util/types'
@@ -107,6 +107,79 @@ export type BlockProvider = 'Local' | 'NonLocal'
 /** Whether async backing is enabled or disabled on the querying parachain. */
 export type AsyncBacking = 'Enabled' | 'Disabled'
 
+/**
+ * Given a PJS client and a call, modify the `scheduler` pallet's `agenda` storage to execute the list of extrinsics
+ * in the next block.
+ *
+ * The calls can be either inline calls or lookup calls, which in the latter case *must* have been noted
+ * in the storage of the chain's `preimage` pallet with a `notePreimage` extrinsic.
+ *
+ * @param blockProvider Whether the calls are being scheduled on a chain that uses a local or nonlocal block provider.
+ *        This chain's runtime *must* have the scheduler pallet available.
+ */
+export async function scheduleCallListWithOrigin(
+  client: {
+    api: ApiPromise
+    dev: {
+      setStorage: (values: StorageValues, blockHash?: string) => Promise<any>
+    }
+  },
+  calls: {
+    call:
+      | { Inline: any }
+      | {
+          Lookup: {
+            hash: any
+            len: any
+          }
+        }
+    origin: any
+  }[],
+  blockProvider: BlockProvider = 'Local',
+) {
+  const scheduledBlock = await match(blockProvider)
+    .with('Local', async () => (await client.api.rpc.chain.getHeader()).number.toNumber() + 1)
+    .with('NonLocal', async () =>
+      ((await client.api.query.parachainSystem.lastRelayChainBlockNumber()) as any).toNumber(),
+    )
+    .exhaustive()
+
+  const agenda = calls.map(({ call, origin }) => [
+    [scheduledBlock],
+    [
+      {
+        call,
+        origin: origin,
+      },
+    ],
+  ])
+
+  await client.dev.setStorage({
+    Scheduler: {
+      agenda: agenda,
+    },
+  })
+}
+
+/**
+ * Given a PJS client and a list of inline calls with the same origin, modify the `scheduler`
+ * pallet's `agenda` storage to execute the extrinsic in the next block.
+ */
+export async function scheduleInlineCallListWithSameOrigin(
+  client: {
+    api: ApiPromise
+    dev: {
+      setStorage: (values: StorageValues, blockHash?: string) => Promise<any>
+    }
+  },
+  encodedCall: HexString[],
+  origin: any,
+  blockProvider: BlockProvider = 'Local',
+) {
+  const callList = encodedCall.map((call) => ({ call: { Inline: call }, origin }))
+  await scheduleCallListWithOrigin(client, callList, blockProvider)
+}
+
 /**
  * Given a PJS client and a call, modify the `scheduler` pallet's `agenda` storage to execute the extrinsic in the next
  * block.
@@ -135,28 +208,7 @@ export async function scheduleCallWithOrigin(
   origin: any,
   blockProvider: BlockProvider = 'Local',
 ) {
-  const scheduledBlock = await match(blockProvider)
-    .with('Local', async () => (await client.api.rpc.chain.getHeader()).number.toNumber() + 1)
-    .with('NonLocal', async () =>
-      ((await client.api.query.parachainSystem.lastRelayChainBlockNumber()) as any).toNumber(),
-    )
-    .exhaustive()
-
-  await client.dev.setStorage({
-    Scheduler: {
-      agenda: [
-        [
-          [scheduledBlock],
-          [
-            {
-              call,
-              origin: origin,
-            },
-          ],
-        ],
-      ],
-    },
-  })
+  await scheduleCallListWithOrigin(client, [{ call, origin }], blockProvider)
 }
 
 /**
@@ -487,6 +539,22 @@ export function sortAddressesByBytes(addresses: string[], addressEncoding: numbe
     .map((bytes) => encodeAddress(bytes, addressEncoding))
 }
 
+/**
+ * Get the free funds of an account.
+ */
+export async function getFreeFunds(client: Client<any, any>, address: any): Promise<number> {
+  const account = (await client.api.query.system.account(address)) as FrameSystemAccountInfo
+  return account.data.free.toNumber()
+}
+
+/**
+ * Get the reserved funds of an account.
+ */
+export async function getReservedFunds(client: Client<any, any>, address: any): Promise<number> {
+  const account = (await client.api.query.system.account(address)) as FrameSystemAccountInfo
+  return account.data.reserved.toNumber()
+}
+
 /**
  * Configuration for relay chain tests.
  */

packages/shared/src/multisig.proxy.ts

@@ -5,7 +5,6 @@ import { type Client, setupBalances, setupNetworks, verifyPureProxy } from '@e2e
 
 import type { KeyringPair } from '@polkadot/keyring/types'
 import type { AccountId32 } from '@polkadot/types/interfaces/runtime'
-import type { FrameSystemAccountInfo } from '@polkadot/types/lookup'
 import type { U8aFixed } from '@polkadot/types-codec'
 import { encodeAddress } from '@polkadot/util-crypto'
 
@@ -16,6 +15,8 @@ import {
   check,
   checkEvents,
   getBlockNumber,
+  getFreeFunds,
+  getReservedFunds,
   sortAddressesByBytes,
   type TestConfig,
 } from './helpers/index.js'
@@ -86,22 +87,6 @@ async function getAndVerifyMultisigEventData(
   return [multisigAddress, multisigExtrinsicIndex, multisigCallHash]
 }
 
-/**
- * Get the free funds of an account.
- */
-async function getFreeFunds(client: Client<any, any>, address: any): Promise<number> {
-  const account = (await client.api.query.system.account(address)) as FrameSystemAccountInfo
-  return account.data.free.toNumber()
-}
-
-/**
- * Get the reserved funds of an account.
- */
-async function getReservedFunds(client: Client<any, any>, address: any): Promise<number> {
-  const account = (await client.api.query.system.account(address)) as FrameSystemAccountInfo
-  return account.data.reserved.toNumber()
-}
-
 /**
  * Get the costs for creating a number of proxies.
  */