git.delta.rocks / unique-network / refs/commits / bd22bf4f1cc0

--- a/tests/src/maintenance.seqtest.ts
+++ b/tests/src/maintenance.seqtest.ts
@@ -192,19 +192,22 @@
       const blocksToWait = 6;
 
       // Scheduling works before the maintenance
-      await nftBeforeMM.scheduleAfter(blocksToWait, {scheduledId: scheduledIdBeforeMM})
-        .transfer(bob, {Substrate: superuser.address});
+      await helper.scheduler.scheduleAfter(blocksToWait, {scheduledId: scheduledIdBeforeMM})
+        .nft.transferToken(bob, collection.collectionId, nftBeforeMM.tokenId, {Substrate: superuser.address});
+
 
       await helper.wait.newBlocks(blocksToWait + 1);
       expect(await nftBeforeMM.getOwner()).to.be.deep.equal({Substrate: superuser.address});
 
       // Schedule a transaction that should occur *during* the maintenance
-      await nftDuringMM.scheduleAfter(blocksToWait, {scheduledId: scheduledIdDuringMM})
-        .transfer(bob, {Substrate: superuser.address});
+      await helper.scheduler.scheduleAfter(blocksToWait, {scheduledId: scheduledIdDuringMM})
+        .nft.transferToken(bob, collection.collectionId, nftDuringMM.tokenId, {Substrate: superuser.address});
+
 
       // Schedule a transaction that should occur *after* the maintenance
-      await nftDuringMM.scheduleAfter(blocksToWait * 2, {scheduledId: scheduledIdBunkerThroughMM})
-        .transfer(bob, {Substrate: superuser.address});
+      await helper.scheduler.scheduleAfter(blocksToWait * 2, {scheduledId: scheduledIdBunkerThroughMM})
+        .nft.transferToken(bob, collection.collectionId, nftDuringMM.tokenId, {Substrate: superuser.address});
+
 
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.maintenance.enable', []);
       expect(await maintenanceEnabled(helper.getApi()), 'MM is OFF when it should be ON').to.be.true;
@@ -214,16 +217,16 @@
       expect(await nftDuringMM.getOwner()).to.be.deep.equal({Substrate: bob.address});
 
       // Any attempts to schedule a tx during the MM should be rejected
-      await expect(nftDuringMM.scheduleAfter(blocksToWait, {scheduledId: scheduledIdAttemptDuringMM})
-        .transfer(bob, {Substrate: superuser.address}))
+      await expect(helper.scheduler.scheduleAfter(blocksToWait, {scheduledId: scheduledIdAttemptDuringMM})
+        .nft.transferToken(bob, collection.collectionId, nftDuringMM.tokenId, {Substrate: superuser.address}))
         .to.be.rejectedWith(/Invalid Transaction: Transaction call is not expected/);
 
       await helper.getSudo().executeExtrinsic(superuser, 'api.tx.maintenance.disable', []);
       expect(await maintenanceEnabled(helper.getApi()), 'MM is ON when it should be OFF').to.be.false;
 
       // Scheduling works after the maintenance
-      await nftAfterMM.scheduleAfter(blocksToWait, {scheduledId: scheduledIdAfterMM})
-        .transfer(bob, {Substrate: superuser.address});
+      await helper.scheduler.scheduleAfter(blocksToWait, {scheduledId: scheduledIdAfterMM})
+        .nft.transferToken(bob, collection.collectionId, nftAfterMM.tokenId, {Substrate: superuser.address});
 
       await helper.wait.newBlocks(blocksToWait + 1);
 

48    const scheduledId = scheduleKind == 'named' ? helper.arrange.makeScheduledId() : undefined;48    const scheduledId = scheduleKind == 'named' ? helper.arrange.makeScheduledId() : undefined;
49    const blocksBeforeExecution = 4;49    const blocksBeforeExecution = 4;
50
51    await token.scheduleAfter(blocksBeforeExecution, {scheduledId})50    await helper.scheduler.scheduleAfter(blocksBeforeExecution, {scheduledId})
52      .transfer(alice, {Substrate: bob.address});51      .nft.transferToken(alice, collection.collectionId, token.tokenId, {Substrate: bob.address});
53    const executionBlock = await helper.chain.getLatestBlockNumber() + blocksBeforeExecution + 1;52    const executionBlock = await helper.chain.getLatestBlockNumber() + blocksBeforeExecution + 1;
5453
55    expect(await token.getOwner()).to.be.deep.equal({Substrate: alice.address});54    expect(await token.getOwner()).to.be.deep.equal({Substrate: alice.address});
103102
104    expect(await token.getOwner()).to.be.deep.equal({Substrate: alice.address});103    expect(await token.getOwner()).to.be.deep.equal({Substrate: alice.address});
105104
106    await token.scheduleAfter(waitForBlocks, {scheduledId})105    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
107      .transfer(alice, {Substrate: bob.address});106      .nft.transferToken(alice, collection.collectionId, token.tokenId, {Substrate: bob.address});
108    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;107    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;
109108
110    await helper.scheduler.cancelScheduled(alice, scheduledId);109    await helper.scheduler.cancelScheduled(alice, scheduledId);
363    const scheduledId = helper.arrange.makeScheduledId();362    const scheduledId = helper.arrange.makeScheduledId();
364    const waitForBlocks = 4;363    const waitForBlocks = 4;
365364
366    await token.scheduleAfter(waitForBlocks, {scheduledId})365    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
367      .transfer(bob, {Substrate: alice.address});366      .nft.transferToken(bob, collection.collectionId, token.tokenId, {Substrate: alice.address});
368    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;367    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;
369368
370    await helper.getSudo().scheduler.cancelScheduled(superuser, scheduledId);369    await helper.getSudo().scheduler.cancelScheduled(superuser, scheduledId);
404    const scheduledId = helper.arrange.makeScheduledId();403    const scheduledId = helper.arrange.makeScheduledId();
405    const waitForBlocks = 6;404    const waitForBlocks = 6;
406405
407    await token.scheduleAfter(waitForBlocks, {scheduledId})406    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
408      .transfer(bob, {Substrate: alice.address});407      .nft.transferToken(bob, collection.collectionId, token.tokenId, {Substrate: alice.address});
409    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;408    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;
410409
411    const priority = 112;410    const priority = 112;
583    const scheduledId = helper.arrange.makeScheduledId();582    const scheduledId = helper.arrange.makeScheduledId();
584    const waitForBlocks = 4;583    const waitForBlocks = 4;
585584
586    await token.scheduleAfter(waitForBlocks, {scheduledId})585    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
587      .transfer(alice, {Substrate: bob.address});586      .nft.transferToken(alice, collection.collectionId, token.tokenId, {Substrate: bob.address});
588    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;587    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;
589588
590    const scheduled = helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId});589    const scheduled = helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId});
614    const scheduledId = helper.arrange.makeScheduledId();613    const scheduledId = helper.arrange.makeScheduledId();
615    const waitForBlocks = 4;614    const waitForBlocks = 4;
616615
617    await token.scheduleAfter(waitForBlocks, {scheduledId})616    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
618      .transfer(alice, {Substrate: bob.address});617      .nft.transferToken(alice, collection.collectionId, token.tokenId, {Substrate: bob.address});
619    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;618    const executionBlock = await helper.chain.getLatestBlockNumber() + waitForBlocks + 1;
620619
621    await expect(helper.scheduler.cancelScheduled(bob, scheduledId))620    await expect(helper.scheduler.cancelScheduled(bob, scheduledId))
655    const scheduledId = helper.arrange.makeScheduledId();654    const scheduledId = helper.arrange.makeScheduledId();
656    const waitForBlocks = 4;655    const waitForBlocks = 4;
657656
658    await token.scheduleAfter(waitForBlocks, {scheduledId})657    await helper.scheduler.scheduleAfter(waitForBlocks, {scheduledId})
659      .transfer(bob, {Substrate: alice.address});658      .nft.transferToken(bob, collection.collectionId, token.tokenId, {Substrate: alice.address});
660659
661    const priority = 112;660    const priority = 112;
662    await expect(helper.scheduler.changePriority(alice, scheduledId, priority))661    await expect(helper.scheduler.changePriority(alice, scheduledId, priority))

--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -609,7 +609,7 @@
     this.wait = new WaitGroup(this);
   }
 
-  getSudo<T extends UniqueHelper>() {
+  getSudo<T extends AstarHelper>() {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const SudoHelperType = SudoHelper(this.helperBase);
     return this.clone(SudoHelperType) as T;
@@ -636,7 +636,7 @@
     super(logger, options);
     this.wait = new WaitGroup(this);
   }
-  getSudo<T extends UniqueHelper>() {
+  getSudo<T extends AcalaHelper>() {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const SudoHelperType = SudoHelper(this.helperBase);
     return this.clone(SudoHelperType) as T;