Skip to content
This repository was archived by the owner on Jul 6, 2022. It is now read-only.

Commit de2b1f9

Browse files
author
Victor Wiebe
committed
fix: 🐛 broken wrapper and get test to pass. prettier changes
1 parent 0d83312 commit de2b1f9

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/contract_wrappers/modules/transfer_manager/__tests__/lock_up_transfer_manager_wrapper.test.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import ContractFactory from '../../../../factories/contractFactory';
1313
import ModuleWrapper from '../../module_wrapper';
1414
import {
1515
bytes32ArrayToStringArray,
16+
bytes32ToString,
1617
dateToBigNumber,
1718
stringArrayToBytes32Array,
1819
stringToBytes32,
@@ -330,12 +331,12 @@ describe('LockUpTransferManagerWrapper', () => {
330331
test('should call to getAllLockupData', async () => {
331332
const expectedDecimalsResult = new BigNumber(18);
332333
const expectedNames = stringArrayToBytes32Array(['Lockup1', 'Lockup2']);
333-
const expectedLockupAmount = valueToWei(new BigNumber(2), expectedDecimalsResult);
334+
const expectedLockupAmount = valueToWei(new BigNumber(50), expectedDecimalsResult);
334335
const startTime = new Date(2030, 1);
335336
const expectedStartTime = dateToBigNumber(startTime);
336337
const expectedLockUpPeriodSeconds = new BigNumber(3600);
337338
const expectedReleaseFrequencySeconds = new BigNumber(60);
338-
const expectedUnlockedAmount = new BigNumber(1);
339+
const expectedUnlockedAmount = valueToWei(new BigNumber(100), expectedDecimalsResult);
339340
const expectedResult = [
340341
expectedNames,
341342
[expectedLockupAmount, expectedLockupAmount],
@@ -369,11 +370,11 @@ describe('LockUpTransferManagerWrapper', () => {
369370
const result = await target.getAllLockupData();
370371
// Result expectation
371372
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]));
373374
expect(result[i].lockupAmount).toEqual(weiToValue(expectedLockupAmount, expectedDecimalsResult));
374375
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]);
377378
expect(result[i].unlockedAmount).toEqual(weiToValue(expectedUnlockedAmount, expectedDecimalsResult));
378379
}
379380

@@ -446,7 +447,7 @@ describe('LockUpTransferManagerWrapper', () => {
446447
test('should call to getLockupsNamesToUser', async () => {
447448
const expectedResult = stringArrayToBytes32Array(['Lock1', 'Lock2']);
448449
const mockedParams = {
449-
user: '0x8888888888888888888888888888888888888888'
450+
user: '0x8888888888888888888888888888888888888888',
450451
};
451452
// Mocked method
452453
const mockedMethod = mock(MockedCallMethod);
@@ -471,7 +472,7 @@ describe('LockUpTransferManagerWrapper', () => {
471472
const expectedDecimalsResult = new BigNumber(18);
472473
const expectedResult = new BigNumber(100);
473474
const mockedParams = {
474-
user: '0x8888888888888888888888888888888888888888'
475+
user: '0x8888888888888888888888888888888888888888',
475476
};
476477

477478
// Security Token Address expected
@@ -481,7 +482,7 @@ describe('LockUpTransferManagerWrapper', () => {
481482
when(mockedContract.securityToken).thenReturn(instance(mockedGetSecurityTokenAddressMethod));
482483
when(mockedGetSecurityTokenAddressMethod.callAsync()).thenResolve(expectedSecurityTokenAddress);
483484
when(mockedContractFactory.getSecurityTokenContract(expectedSecurityTokenAddress)).thenResolve(
484-
instance(mockedSecurityTokenContract),
485+
instance(mockedSecurityTokenContract),
485486
);
486487
const mockedSecurityTokenDecimalsMethod = mock(MockedCallMethod);
487488
when(mockedSecurityTokenDecimalsMethod.callAsync()).thenResolve(expectedDecimalsResult);

src/contract_wrappers/modules/transfer_manager/lock_up_transfer_manager_wrapper.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,14 +244,14 @@ export default class LockUpTransferManagerWrapper extends ModuleWrapper {
244244
const result = await (await this.contract).getAllLockupData.callAsync();
245245
const decimals = await (await this.securityTokenContract()).decimals.callAsync();
246246
const typedResult: GetLockupData[] = [];
247-
for (let i = 0; i <= result[0].length; i += 1) {
247+
for (let i = 0; i < result[0].length; i += 1) {
248248
typedResult.push({
249249
lockupName: bytes32ToString(result[0][i]),
250250
lockupAmount: weiToValue(result[1][i], decimals),
251251
startTime: bigNumberToDate(result[2][i]),
252252
lockUpPeriodSeconds: result[3][i],
253253
releaseFrequencySeconds: result[4][i],
254-
unlockedAmount: weiToValue(result[1][i], decimals),
254+
unlockedAmount: weiToValue(result[5][i], decimals),
255255
});
256256
}
257257
return typedResult;
@@ -290,7 +290,7 @@ export default class LockUpTransferManagerWrapper extends ModuleWrapper {
290290
};
291291

292292
/*
293-
* verifyTransfer
293+
* verifyTransfer
294294
*/
295295
public verifyTransfer = async (params: VerifyTransferParams): Promise<VerifyTransfer> => {
296296
assert.isETHAddressHex('from', params.from);

0 commit comments

Comments
 (0)