@@ -13,6 +13,7 @@ import ContractFactory from '../../../../factories/contractFactory';
13
13
import ModuleWrapper from '../../module_wrapper' ;
14
14
import {
15
15
bytes32ArrayToStringArray ,
16
+ bytes32ToString ,
16
17
dateToBigNumber ,
17
18
stringArrayToBytes32Array ,
18
19
stringToBytes32 ,
@@ -330,12 +331,12 @@ describe('LockUpTransferManagerWrapper', () => {
330
331
test ( 'should call to getAllLockupData' , async ( ) => {
331
332
const expectedDecimalsResult = new BigNumber ( 18 ) ;
332
333
const expectedNames = stringArrayToBytes32Array ( [ 'Lockup1' , 'Lockup2' ] ) ;
333
- const expectedLockupAmount = valueToWei ( new BigNumber ( 2 ) , expectedDecimalsResult ) ;
334
+ const expectedLockupAmount = valueToWei ( new BigNumber ( 50 ) , expectedDecimalsResult ) ;
334
335
const startTime = new Date ( 2030 , 1 ) ;
335
336
const expectedStartTime = dateToBigNumber ( startTime ) ;
336
337
const expectedLockUpPeriodSeconds = new BigNumber ( 3600 ) ;
337
338
const expectedReleaseFrequencySeconds = new BigNumber ( 60 ) ;
338
- const expectedUnlockedAmount = new BigNumber ( 1 ) ;
339
+ const expectedUnlockedAmount = valueToWei ( new BigNumber ( 100 ) , expectedDecimalsResult ) ;
339
340
const expectedResult = [
340
341
expectedNames ,
341
342
[ expectedLockupAmount , expectedLockupAmount ] ,
@@ -369,11 +370,11 @@ describe('LockUpTransferManagerWrapper', () => {
369
370
const result = await target . getAllLockupData ( ) ;
370
371
// Result expectation
371
372
for ( let i = 0 ; i < result . length ; i += 1 ) {
372
- expect ( result [ 1 ] . lockupName ) . toEqual ( bytes32ArrayToStringArray ( expectedNames ) ) ;
373
+ expect ( result [ i ] . lockupName ) . toEqual ( bytes32ToString ( expectedNames [ i ] ) ) ;
373
374
expect ( result [ i ] . lockupAmount ) . toEqual ( weiToValue ( expectedLockupAmount , expectedDecimalsResult ) ) ;
374
375
expect ( result [ i ] . startTime ) . toEqual ( startTime ) ;
375
- expect ( result [ i ] . lockUpPeriodSeconds ) . toBe ( expectedResult [ 2 ] ) ;
376
- expect ( result [ i ] . releaseFrequencySeconds ) . toBe ( expectedResult [ 3 ] ) ;
376
+ expect ( result [ i ] . lockUpPeriodSeconds ) . toBe ( expectedResult [ 3 ] [ i ] ) ;
377
+ expect ( result [ i ] . releaseFrequencySeconds ) . toBe ( expectedResult [ 4 ] [ i ] ) ;
377
378
expect ( result [ i ] . unlockedAmount ) . toEqual ( weiToValue ( expectedUnlockedAmount , expectedDecimalsResult ) ) ;
378
379
}
379
380
@@ -446,7 +447,7 @@ describe('LockUpTransferManagerWrapper', () => {
446
447
test ( 'should call to getLockupsNamesToUser' , async ( ) => {
447
448
const expectedResult = stringArrayToBytes32Array ( [ 'Lock1' , 'Lock2' ] ) ;
448
449
const mockedParams = {
449
- user : '0x8888888888888888888888888888888888888888'
450
+ user : '0x8888888888888888888888888888888888888888' ,
450
451
} ;
451
452
// Mocked method
452
453
const mockedMethod = mock ( MockedCallMethod ) ;
@@ -471,7 +472,7 @@ describe('LockUpTransferManagerWrapper', () => {
471
472
const expectedDecimalsResult = new BigNumber ( 18 ) ;
472
473
const expectedResult = new BigNumber ( 100 ) ;
473
474
const mockedParams = {
474
- user : '0x8888888888888888888888888888888888888888'
475
+ user : '0x8888888888888888888888888888888888888888' ,
475
476
} ;
476
477
477
478
// Security Token Address expected
@@ -481,7 +482,7 @@ describe('LockUpTransferManagerWrapper', () => {
481
482
when ( mockedContract . securityToken ) . thenReturn ( instance ( mockedGetSecurityTokenAddressMethod ) ) ;
482
483
when ( mockedGetSecurityTokenAddressMethod . callAsync ( ) ) . thenResolve ( expectedSecurityTokenAddress ) ;
483
484
when ( mockedContractFactory . getSecurityTokenContract ( expectedSecurityTokenAddress ) ) . thenResolve (
484
- instance ( mockedSecurityTokenContract ) ,
485
+ instance ( mockedSecurityTokenContract ) ,
485
486
) ;
486
487
const mockedSecurityTokenDecimalsMethod = mock ( MockedCallMethod ) ;
487
488
when ( mockedSecurityTokenDecimalsMethod . callAsync ( ) ) . thenResolve ( expectedDecimalsResult ) ;
0 commit comments