From 343d804c01f9068b9280825d9c10861068f6e57b Mon Sep 17 00:00:00 2001
From: Max Andreev <maksandre@yandex.ru>
Date: Thu, 15 Sep 2022 09:01:25 +0000
Subject: [PATCH] Fix: review


---
--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -414,8 +414,8 @@
     const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});
       
     await collection.burn(collectionOwner);
-    await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId))).to.be.rejected;
-    await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(999999999))).to.be.rejected;
+    await expect(helper.executeExtrinsic(palletAdmin, 'api.tx.appPromotion.stopSponsoringCollection', [collection.collectionId], true)).to.be.rejectedWith('common.CollectionNotFound');
+    await expect(helper.executeExtrinsic(palletAdmin, 'api.tx.appPromotion.stopSponsoringCollection', [999_999_999], true)).to.be.rejectedWith('common.CollectionNotFound');
   });
 });
 
@@ -459,8 +459,8 @@
 
     // new sponsor is pallet address
     expect(await contractHelper.methods.hasSponsor(flipper.options.address).call()).to.be.true;  
-    expect((await helper.api!.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner);  
-    expect((await helper.api!.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({
+    expect((await helper.callRpc('api.query.evmContractHelpers.owner', [flipper.options.address])).toJSON()).to.be.equal(contractOwner);  
+    expect((await helper.callRpc('api.query.evmContractHelpers.sponsoring', [flipper.options.address])).toJSON()).to.deep.equal({
       confirmed: {
         substrate: palletAddress,
       },
@@ -602,7 +602,7 @@
 
   itSub('can not be called by non admin', async ({helper}) => {
     const nonAdmin = accounts.pop()!;
-    await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.payoutStakers(100))).to.be.rejected;
+    await expect(helper.admin.payoutStakers(nonAdmin, 100)).to.be.rejectedWith('appPromotion.NoPermission');
   });
 
   itSub('should increase total staked', async ({helper}) => {
@@ -613,7 +613,7 @@
     // Wait for rewards and pay
     const [stakedInBlock] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stakedInBlock.block));
-    const totalPayout = (await helper.sudo.payoutStakers(palletAdmin, 100)).reduce((prev, payout) => prev + payout.payout, 0n);
+    const totalPayout = (await helper.admin.payoutStakers(palletAdmin, 100)).reduce((prev, payout) => prev + payout.payout, 0n);
 
     const totalStakedAfter = await helper.staking.getTotalStaked();
     expect(totalStakedAfter).to.equal(totalStakedBefore + (100n * nominal) + totalPayout);
@@ -634,7 +634,7 @@
     const [_, stake2] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake2.block));
 
-    const payoutToStaker = (await helper.sudo.payoutStakers(palletAdmin, 100)).find((payout) => payout.staker === staker.address)?.payout;
+    const payoutToStaker = (await helper.admin.payoutStakers(palletAdmin, 100)).find((payout) => payout.staker === staker.address)?.payout;
     expect(payoutToStaker + 300n * nominal).to.equal(calculateIncome(300n * nominal, 10n));
 
     const totalStakedPerBlock = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
@@ -650,7 +650,7 @@
     let [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block) + LOCKING_PERIOD);
 
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     const frozenBalanceShouldBe = calculateIncome(100n * nominal, 10n, 2);
     expect(stake.amount).to.be.equal(frozenBalanceShouldBe);
@@ -670,7 +670,7 @@
       
     // so he did not receive any rewards
     const totalBalanceBefore = await helper.balance.getSubstrate(staker.address);
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     const totalBalanceAfter = await helper.balance.getSubstrate(staker.address);
 
     expect(totalBalanceBefore).to.be.equal(totalBalanceAfter);
@@ -684,12 +684,12 @@
     let [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block));
       
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     expect(stake.amount).to.equal(calculateIncome(100n * nominal, 10n));
       
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block) + LOCKING_PERIOD);
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     expect(stake.amount).to.equal(calculateIncome(100n * nominal, 10n, 2));
   });
@@ -703,7 +703,7 @@
       await Promise.all(oneHundredStakers.map(staker => helper.staking.stake(staker, 100n * nominal)));
     }
     await helper.wait.newBlocks(40);
-    const result = await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
   });
 
   itSub.skip('can handle 40.000 rewards', async ({helper}) => {
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -201,6 +201,9 @@
 
   async deployFlipper(signer: string): Promise<Contract> {
     return await this.helper.ethContract.deployByCode(signer, 'Flipper', `
+    // SPDX-License-Identifier: UNLICENSED
+    pragma solidity ^0.8.6;
+
     contract Flipper {
       bool value = false;
       function flip() public {
--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -60,13 +60,13 @@
    */
   arrange: ArrangeGroup;
   wait: WaitGroup;
-  sudo: SudoGroup;
+  admin: AdminGroup;
 
   constructor(logger: { log: (msg: any, level: any) => void, level: any }) {
     super(logger);
     this.arrange = new ArrangeGroup(this);
     this.wait = new WaitGroup(this);
-    this.sudo = new SudoGroup(this);
+    this.admin = new AdminGroup(this);
   }
 
   async connect(wsEndpoint: string, _listeners?: any): Promise<void> {
@@ -284,7 +284,7 @@
   }
 }
 
-class SudoGroup {
+class AdminGroup {
   helper: UniqueHelper;
 
   constructor(helper: UniqueHelper) {
@@ -301,4 +301,4 @@
       };
     });
   }
-}
\ No newline at end of file
+}

-- 
gitstuff