@@ -233,18 +233,19 @@ describe('Integration tests', function () {
233233 ) ;
234234 const schedulerRewardPerTask = workerpoolPrice - workerRewardPerTask ;
235235 // Check initial balances.
236- let accounts = [
236+ let proxyInitBalance = dealPrice + schedulerStakePerDeal ;
237+ let accountsInitBalances = [
237238 { signer : requester , balance : 0 , frozen : dealPrice } ,
238239 { signer : scheduler , balance : 0 , frozen : schedulerStakePerDeal } ,
239240 { signer : appProvider , balance : 0 , frozen : 0 } ,
240241 { signer : datasetProvider , balance : 0 , frozen : 0 } ,
241242 ] ;
242243 for ( let i = 0 ; i < workerNumber ; i ++ ) {
243- accounts . push ( { signer : workers [ i ] , balance : 0 , frozen : 0 } ) ;
244+ accountsInitBalances . push ( { signer : workers [ i ] , balance : 0 , frozen : 0 } ) ;
244245 }
245246 await checkBalancesAndFrozens ( {
246- proxyBalance : dealPrice + schedulerStakePerDeal ,
247- accounts,
247+ proxyBalance : proxyInitBalance ,
248+ accounts : accountsInitBalances ,
248249 } ) ;
249250 for ( let i = 0 ; i < workerNumber ; i ++ ) {
250251 expect ( await iexecPoco . viewScore ( workers [ i ] . address ) ) . to . be . equal ( 0 ) ;
@@ -271,26 +272,44 @@ describe('Integration tests', function () {
271272 expect ( ( await iexecPoco . viewTask ( taskId ) ) . status ) . to . equal (
272273 TaskStatusEnum . COMPLETED ,
273274 ) ;
274- accounts = [
275- { signer : requester , balance : 0 , frozen : dealPrice - taskPrice } ,
275+ let proxyFinalBalance = proxyInitBalance - ( dealPrice + schedulerStakePerDeal ) ;
276+ let accountsFinalBalances = [
277+ {
278+ signer : requester ,
279+ balance : accountsInitBalances [ 0 ] . balance ,
280+ frozen : accountsInitBalances [ 0 ] . frozen - taskPrice ,
281+ } ,
276282 {
277283 signer : scheduler ,
278- balance : schedulerStakePerTask + schedulerRewardPerTask ,
279- frozen : schedulerStakePerDeal - schedulerStakePerTask ,
284+ balance :
285+ accountsInitBalances [ 1 ] . balance +
286+ ( schedulerStakePerTask + schedulerRewardPerTask ) ,
287+ frozen : accountsInitBalances [ 1 ] . frozen - schedulerStakePerTask ,
288+ } ,
289+ {
290+ signer : appProvider ,
291+ balance : accountsInitBalances [ 2 ] . balance + appPrice ,
292+ frozen : accountsInitBalances [ 2 ] . frozen ,
293+ } ,
294+ {
295+ signer : datasetProvider ,
296+ balance : accountsInitBalances [ 3 ] . balance + datasetPrice ,
297+ frozen : accountsInitBalances [ 3 ] . frozen ,
280298 } ,
281- { signer : appProvider , balance : appPrice , frozen : 0 } ,
282- { signer : datasetProvider , balance : datasetPrice , frozen : 0 } ,
283299 ] ;
284300 for ( let i = 0 ; i < workerNumber ; i ++ ) {
285- accounts . push ( {
286- signer : disposableWorkers [ i ] ,
287- balance : workerStake + workerRewardPerTask / workerNumber ,
288- frozen : 0 ,
301+ accountsFinalBalances . push ( {
302+ signer : workers [ i ] ,
303+ balance :
304+ accountsInitBalances [ 4 + i ] . balance +
305+ workerStake +
306+ workerRewardPerTask / workerNumber ,
307+ frozen : accountsInitBalances [ 4 + i ] . frozen ,
289308 } ) ;
290309 }
291310 await checkBalancesAndFrozens ( {
292- proxyBalance : 0 ,
293- accounts,
311+ proxyBalance : proxyFinalBalance ,
312+ accounts : accountsFinalBalances ,
294313 } ) ;
295314 for ( let i = 0 ; i < workerNumber ; i ++ ) {
296315 if ( workerNumber == 1 ) {
0 commit comments