Browse Source

network-tests: fix opening id check

Mokhtar Naamani 4 years ago
parent
commit
84472c84cb

+ 6 - 4
tests/network-tests/src/Api.ts

@@ -10,9 +10,10 @@ import {
   Worker,
   WorkerId,
   WorkingGroupOpeningPolicyCommitment,
+  Opening as WorkingGroupOpening,
 } from '@joystream/types/working-group'
 import { ElectionStake, Seat } from '@joystream/types/council'
-import { AccountId, AccountInfo, Balance, BalanceOf, BlockNumber, Event, EventRecord } from '@polkadot/types/interfaces'
+import { AccountInfo, Balance, BalanceOf, BlockNumber, Event, EventRecord } from '@polkadot/types/interfaces'
 import BN from 'bn.js'
 import { SubmittableExtrinsic } from '@polkadot/api/types'
 import { Sender } from './sender'
@@ -982,9 +983,6 @@ export class Api {
   }
 
   public async isStorageProvider(address: string): Promise<boolean> {
-    const storageProviders: Vec<AccountId> = await this.api.query.actors.accountIdsByRole<Vec<AccountId>>(
-      'StorageProvider'
-    )
     const accountWorkers: WorkerId = await this.getWorkerIdByRoleAccount(address, WorkingGroups.StorageWorkingGroup)
     return accountWorkers !== undefined
   }
@@ -1775,6 +1773,10 @@ export class Api {
     return await this.api.query.hiring.openingById<HiringOpening>(id)
   }
 
+  public async getWorkingGroupOpening(id: OpeningId, group: WorkingGroups): Promise<WorkingGroupOpening> {
+    return await this.api.query[group].openingById<WorkingGroupOpening>(id)
+  }
+
   public async getWorkers(module: WorkingGroups): Promise<Worker[]> {
     return (await this.api.query[module].workerById.entries<Worker>()).map((workerWithId) => workerWithId[1])
   }

+ 4 - 4
tests/network-tests/src/fixtures/workingGroupModule.ts

@@ -177,9 +177,10 @@ export class AcceptApplicationsFixture implements Fixture {
 
     // Begin accepting applications
     await this.api.acceptApplications(this.lead, this.openingId, this.module)
-
-    const opening: HiringOpening = await this.api.getHiringOpening(this.openingId)
-    assert(opening.is_active, `Opening ${this.openingId} is not active`)
+    // opening id in working group module is not the same as opening id in hiring module!
+    const wgOpening = await this.api.getWorkingGroupOpening(this.openingId, this.module)
+    const opening: HiringOpening = await this.api.getHiringOpening(wgOpening.hiring_opening_id)
+    assert(opening.is_active, `${this.module} Opening ${this.openingId} is not active`)
     if (expectFailure) {
       throw new Error('Successful fixture run while expecting failure')
     }
@@ -830,7 +831,6 @@ export class AwaitPayoutFixture implements Fixture {
     )
 
     const secondPayoutWaitingPeriod: BN = payoutInterval.addn(1)
-    console.log('waiting period ' + secondPayoutWaitingPeriod)
     await Utils.wait(this.api.getBlockDuration().mul(secondPayoutWaitingPeriod).toNumber())
 
     const balanceAfterSecondPayout: BN = await this.api.getBalance(this.membersKeyPairs[0].address)