git.delta.rocks / unique-network / refs/commits / 465cfefa64e5

difftreelog

Fix helpers and tests

Max Andreev2022-11-30parent: #b8c17db.patch.diff
in: master

2 files changed

modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2343,8 +2343,8 @@
    * @param schedule Schedule params
    * @example vestedTransfer(signer, recepient.address, 20000, 100, 10, 50 * nominal); // total amount of vested tokens will be 100 * 50 = 5000
    */
-  async vestedTransfer(signer: TSigner, address: TSubstrateAccount, schedule: {startRelayBlock: bigint, periodBlocks: bigint, periodCount: bigint, perPeriod: bigint}): Promise<void> {
-    const result = await this.helper.executeExtrinsic(signer, 'api.tx.vesting.vestedTransfer', [address, {start: schedule.startRelayBlock, period: schedule.periodBlocks, periodCount: schedule.periodCount, perPeriod: schedule.perPeriod}]);
+  async vestedTransfer(signer: TSigner, address: TSubstrateAccount, schedule: {start: bigint, period: bigint, periodCount: bigint, perPeriod: bigint}): Promise<void> {
+    const result = await this.helper.executeExtrinsic(signer, 'api.tx.vesting.vestedTransfer', [address, schedule]);
     const event = result.result.events
       .find(e => e.event.section === 'vesting' &&
             e.event.method === 'VestingScheduleAdded' &&
@@ -2357,12 +2357,12 @@
    * @param address Substrate address of recipient
    * @returns 
    */
-  async getVestingSchedules(address: TSubstrateAccount): Promise<{startRelayBlock: bigint, periodBlocks: bigint, periodCount: bigint, perPeriod: bigint}[]> {
+  async getVestingSchedules(address: TSubstrateAccount): Promise<{start: bigint, period: bigint, periodCount: bigint, perPeriod: bigint}[]> {
     const schedule = (await this.helper.callRpc('api.query.vesting.vestingSchedules', [address])).toJSON();
     return schedule.map((schedule: any) => {
       return {
-        startRelayBlock: BigInt(schedule.start),
-        periodBlocks: BigInt(schedule.period),
+        start: BigInt(schedule.start),
+        period: BigInt(schedule.period),
         periodCount: BigInt(schedule.periodCount),
         perPeriod: BigInt(schedule.perPeriod),
       };
modifiedtests/src/vesting.test.tsdiffbeforeafterboth
28 });28 });
29 });29 });
3030
31 itSub('cannot send more tokens than have', async ({helper}) => {
32 const [sender, receiver] = await helper.arrange.createAccounts([1000n, 1n], donor);
33 const manyPeriodsSchedule = {startRelayBlock: 0n, periodBlocks: 1n, periodCount: 100n, perPeriod: 10n * nominal};
34 const oneBigSumSchedule = {startRelayBlock: 0n, periodBlocks: 1n, periodCount: 1n, perPeriod: 5000n * nominal};
35
36 expect(helper.balance.vestedTransfer(sender, sender.address, manyPeriodsSchedule)).to.be.rejected.with('InsufficientBalanceToLock');
37 expect(helper.balance.vestedTransfer(sender, receiver.address, manyPeriodsSchedule)).to.be.rejected.with('InsufficientBalanceToLock');
38 expect(helper.balance.vestedTransfer(sender, sender.address, oneBigSumSchedule)).to.be.rejected.with('InsufficientBalanceToLock');
39 expect(helper.balance.vestedTransfer(sender, receiver.address, oneBigSumSchedule)).to.be.rejected.with('InsufficientBalanceToLock');
40
41 const balanceSender = await helper.balance.getSubstrateFull(sender.address);
42 const balanceReceiver = await helper.balance.getSubstrateFull(receiver.address);
43
44 expect(balanceSender.free / nominal).to.eq(999n);
45 expect(balanceSender.feeFrozen / nominal).to.eq(0n);
46 expect(balanceSender.miscFrozen / nominal).to.eq(0n);
47 expect(balanceSender.reserved / nominal).to.eq(0n);
48
49 expect(balanceReceiver.free).to.be.eq(1n * nominal);
50 expect(balanceReceiver.feeFrozen).to.be.eq(0n);
51 expect(balanceReceiver.miscFrozen).to.be.eq(0n);
52 expect(balanceReceiver.reserved).to.be.eq(0n);
53 });
54
55 itSub('can perform vestedTransfer and claim tokens', async ({helper}) => {31 itSub('can perform vestedTransfer and claim tokens', async ({helper}) => {
56 // arrange32 // arrange
57 const [sender, recepient] = await helper.arrange.createAccounts([1000n, 1n], donor);33 const [sender, recepient] = await helper.arrange.createAccounts([1000n, 1n], donor);
58 const currentRelayBlock = await helper.chain.getRelayBlockNumber();34 const currentRelayBlock = await helper.chain.getRelayBlockNumber();
59 const schedule1 = {startRelayBlock: currentRelayBlock + 4n, periodBlocks: 4n, periodCount: 2n, perPeriod: 50n * nominal};35 const schedule1 = {start: currentRelayBlock + 4n, period: 4n, periodCount: 2n, perPeriod: 50n * nominal};
60 const schedule2 = {startRelayBlock: currentRelayBlock + 8n, periodBlocks: 8n, periodCount: 2n, perPeriod: 100n * nominal};36 const schedule2 = {start: currentRelayBlock + 8n, period: 8n, periodCount: 2n, perPeriod: 100n * nominal};
6137
62 // act38 // act
63 await helper.balance.vestedTransfer(sender, recepient.address, schedule1);39 await helper.balance.vestedTransfer(sender, recepient.address, schedule1);
121 // check sender balance does not changed:97 // check sender balance does not changed:
122 balanceSender = await helper.balance.getSubstrateFull(sender.address);98 balanceSender = await helper.balance.getSubstrateFull(sender.address);
123 expect(balanceSender.free / nominal).to.eq(699n);99 expect(balanceSender.free / nominal).to.eq(699n);
100 expect(balanceSender.feeFrozen).to.eq(0n);
101 expect(balanceSender.miscFrozen).to.eq(0n);
102 expect(balanceSender.reserved).to.eq(0n);
103 });
104
105 itSub('cannot send more tokens than have', async ({helper}) => {
106 const [sender, receiver] = await helper.arrange.createAccounts([1000n, 1n], donor);
107 const schedule = {start: 0n, period: 1n, periodCount: 1n, perPeriod: 100n * nominal};
108 const manyPeriodsSchedule = {start: 0n, period: 1n, periodCount: 100n, perPeriod: 10n * nominal};
109 const oneBigSumSchedule = {start: 0n, period: 1n, periodCount: 1n, perPeriod: 5000n * nominal};
110
111 // Sender cannot send vestedTransfer to self or other
112 await expect(helper.balance.vestedTransfer(sender, sender.address, manyPeriodsSchedule)).to.be.rejectedWith(/InsufficientBalance/);
113 await expect(helper.balance.vestedTransfer(sender, receiver.address, manyPeriodsSchedule)).to.be.rejectedWith(/InsufficientBalance/);
114 await expect(helper.balance.vestedTransfer(sender, sender.address, oneBigSumSchedule)).to.be.rejectedWith(/InsufficientBalance/);
115 await expect(helper.balance.vestedTransfer(sender, receiver.address, oneBigSumSchedule)).to.be.rejectedWith(/InsufficientBalance/);
116
117 const balanceSender = await helper.balance.getSubstrateFull(sender.address);
118 const balanceReceiver = await helper.balance.getSubstrateFull(receiver.address);
119
120 // Sender's balance has not changed
121 expect(balanceSender.free / nominal).to.eq(999n);
122 expect(balanceSender.feeFrozen).to.eq(0n);
123 expect(balanceSender.miscFrozen).to.eq(0n);
124 expect(balanceSender.reserved).to.eq(0n);
125
126 // Receiver's balance has not changed
127 expect(balanceReceiver.free).to.be.eq(1n * nominal);
128 expect(balanceReceiver.feeFrozen).to.be.eq(0n);
129 expect(balanceReceiver.miscFrozen).to.be.eq(0n);
130 expect(balanceReceiver.reserved).to.be.eq(0n);
131
132 // Receiver cannot send vestedTransfer back because of freeze
133 await expect(helper.balance.vestedTransfer(receiver, sender.address, schedule)).to.be.rejectedWith(/InsufficientBalance/);
134 });
135
136 itSub('cannot send vestedTransfer with incorrect parameters', async ({helper}) => {
137 const [sender, receiver] = await helper.arrange.createAccounts([1000n, 1n], donor);
138 const incorrectperiodSchedule = {start: 0n, period: 0n, periodCount: 10n, perPeriod: 10n * nominal};
139 const incorrectPeriodCountSchedule = {start: 0n, period: 1n, periodCount: 0n, perPeriod: 10n * nominal};
140 const incorrectPerPeriodSchedule = {start: 0n, period: 1n, periodCount: 1n, perPeriod: 0n * nominal};
141
142 await expect(helper.balance.vestedTransfer(sender, sender.address, incorrectperiodSchedule)).to.be.rejectedWith(/vesting.ZeroVestingPeriod/);
143 await expect(helper.balance.vestedTransfer(sender, receiver.address, incorrectPeriodCountSchedule)).to.be.rejectedWith(/vesting.ZeroVestingPeriod/);
144 await expect(helper.balance.vestedTransfer(sender, receiver.address, incorrectPerPeriodSchedule)).to.be.rejectedWith(/vesting.AmountLow/);
145
146 const balanceSender = await helper.balance.getSubstrateFull(sender.address);
147 // Sender's balance has not changed
148 expect(balanceSender.free / nominal).to.eq(999n);
124 expect(balanceSender.feeFrozen).to.eq(0n);149 expect(balanceSender.feeFrozen).to.eq(0n);
125 expect(balanceSender.miscFrozen).to.eq(0n);150 expect(balanceSender.miscFrozen).to.eq(0n);
126 expect(balanceSender.reserved).to.eq(0n);151 expect(balanceSender.reserved).to.eq(0n);