@@ -23,7 +23,7 @@ import {
23
23
Subscribe ,
24
24
GetLogs ,
25
25
Perm ,
26
- ErrorCode
26
+ ErrorCode ,
27
27
} from '../../../types' ;
28
28
import {
29
29
bigNumberToDate ,
@@ -206,8 +206,12 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
206
206
}
207
207
208
208
public unpause = async ( params : TxParams ) => {
209
- assert . assert ( await this . paused ( ) , 'Controller not currently paused' ) ;
210
- assert . assert ( await this . isCallerTheSecurityTokenOwner ( params . txData ) , 'Sender is not owner' ) ;
209
+ assert . assert ( await this . paused ( ) , ErrorCode . PreconditionRequired , 'Controller not currently paused' ) ;
210
+ assert . assert (
211
+ await this . isCallerTheSecurityTokenOwner ( params . txData ) ,
212
+ ErrorCode . Unauthorized ,
213
+ 'Sender is not owner' ,
214
+ ) ;
211
215
return ( await this . contract ) . unpause . sendTransactionAsync ( params . txData , params . safetyFactor ) ;
212
216
} ;
213
217
@@ -216,8 +220,12 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
216
220
} ;
217
221
218
222
public pause = async ( params : TxParams ) => {
219
- assert . assert ( ! ( await this . paused ( ) ) , 'Controller currently paused' ) ;
220
- assert . assert ( await this . isCallerTheSecurityTokenOwner ( params . txData ) , 'Sender is not owner' ) ;
223
+ assert . assert ( ! ( await this . paused ( ) ) , ErrorCode . ContractPaused , 'Controller currently paused' ) ;
224
+ assert . assert (
225
+ await this . isCallerTheSecurityTokenOwner ( params . txData ) ,
226
+ ErrorCode . Unauthorized ,
227
+ 'Sender is not owner' ,
228
+ ) ;
221
229
return ( await this . contract ) . pause . sendTransactionAsync ( params . txData , params . safetyFactor ) ;
222
230
} ;
223
231
@@ -256,7 +264,11 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
256
264
} ;
257
265
258
266
public addManualApproval = async ( params : AddManualApprovalParams ) => {
259
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
267
+ assert . assert (
268
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
269
+ ErrorCode . Unauthorized ,
270
+ 'Caller is not allowed' ,
271
+ ) ;
260
272
assert . isETHAddressHex ( 'from' , params . from ) ;
261
273
assert . isNonZeroETHAddressHex ( 'to' , params . to ) ;
262
274
assert . isFutureDate ( params . expiryTime , 'ExpiryTime must be in the future' ) ;
@@ -275,14 +287,19 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
275
287
} ;
276
288
277
289
public addManualApprovalMulti = async ( params : AddManualApprovalMultiParams ) => {
278
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
290
+ assert . assert (
291
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
292
+ ErrorCode . Unauthorized ,
293
+ 'Caller is not allowed' ,
294
+ ) ;
279
295
params . from . forEach ( address => assert . isETHAddressHex ( 'from' , address ) ) ;
280
296
params . to . forEach ( address => assert . isNonZeroETHAddressHex ( 'to' , address ) ) ;
281
297
assert . assert (
282
298
params . from . length === params . to . length &&
283
299
params . from . length === params . allowances . length &&
284
300
params . from . length === params . expiryTimes . length &&
285
301
params . from . length === params . descriptions . length ,
302
+ ErrorCode . MismatchedArrayLength ,
286
303
'Array lengths missmatch' ,
287
304
) ;
288
305
params . expiryTimes . forEach ( expiry => assert . isFutureDate ( expiry , 'ExpiryTime must be in the future' ) ) ;
@@ -307,7 +324,11 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
307
324
} ;
308
325
309
326
public modifyManualApproval = async ( params : ModifyManualApprovalParams ) => {
310
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
327
+ assert . assert (
328
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
329
+ ErrorCode . Unauthorized ,
330
+ 'Caller is not allowed' ,
331
+ ) ;
311
332
assert . isETHAddressHex ( 'from' , params . from ) ;
312
333
assert . isNonZeroETHAddressHex ( 'to' , params . to ) ;
313
334
assert . isFutureDate ( params . expiryTime , 'ExpiryTime must be in the future' ) ;
@@ -326,14 +347,19 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
326
347
} ;
327
348
328
349
public modifyManualApprovalMulti = async ( params : ModifyManualApprovalMultiParams ) => {
329
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
350
+ assert . assert (
351
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
352
+ ErrorCode . Unauthorized ,
353
+ 'Caller is not allowed' ,
354
+ ) ;
330
355
params . from . forEach ( address => assert . isETHAddressHex ( 'from' , address ) ) ;
331
356
params . to . forEach ( address => assert . isNonZeroETHAddressHex ( 'to' , address ) ) ;
332
357
assert . assert (
333
358
params . from . length === params . to . length &&
334
359
params . from . length === params . changedAllowances . length &&
335
360
params . from . length === params . expiryTimes . length &&
336
361
params . from . length === params . descriptions . length ,
362
+ ErrorCode . MismatchedArrayLength ,
337
363
'Array lengths missmatch' ,
338
364
) ;
339
365
params . expiryTimes . forEach ( expiry => assert . isFutureDate ( expiry , 'ExpiryTime must be in the future' ) ) ;
@@ -356,7 +382,11 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
356
382
} ;
357
383
358
384
public revokeManualApproval = async ( params : RevokeManualApprovalParams ) => {
359
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
385
+ assert . assert (
386
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
387
+ ErrorCode . Unauthorized ,
388
+ 'Caller is not allowed' ,
389
+ ) ;
360
390
assert . isETHAddressHex ( 'from' , params . from ) ;
361
391
assert . isETHAddressHex ( 'to' , params . to ) ;
362
392
await this . checkApprovalDoesExist ( params . from , params . to ) ;
@@ -369,10 +399,18 @@ export default class ManualApprovalTransferManagerWrapper extends ModuleWrapper
369
399
} ;
370
400
371
401
public revokeManualApprovalMulti = async ( params : RevokeManualApprovalMultiParams ) => {
372
- assert . assert ( await this . isCallerAllowed ( params . txData , Perm . Admin ) , 'Caller is not allowed' ) ;
402
+ assert . assert (
403
+ await this . isCallerAllowed ( params . txData , Perm . Admin ) ,
404
+ ErrorCode . Unauthorized ,
405
+ 'Caller is not allowed' ,
406
+ ) ;
373
407
params . from . forEach ( address => assert . isETHAddressHex ( 'from' , address ) ) ;
374
408
params . to . forEach ( address => assert . isETHAddressHex ( 'to' , address ) ) ;
375
- assert . assert ( params . to . length === params . from . length , 'To and From address arrays must have the same length' ) ;
409
+ assert . assert (
410
+ params . to . length === params . from . length ,
411
+ ErrorCode . MismatchedLength ,
412
+ 'To and From address arrays must have the same length' ,
413
+ ) ;
376
414
const approvals = [ ] ;
377
415
for ( let i = 0 ; i < params . to . length ; i += 1 ) {
378
416
approvals . push ( this . checkApprovalDoesExist ( params . from [ i ] , params . to [ i ] ) ) ;
0 commit comments