Skip to content

Commit 6ca5f2c

Browse files
monitz87monitz87
committed
fix: fix tests and compilation issues
1 parent 905c29e commit 6ca5f2c

File tree

3 files changed

+57
-65
lines changed

3 files changed

+57
-65
lines changed

‎src/procedures/__tests__/LaunchCappedSto.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
PolyTransactionTag,
1717
ProcedureType,
1818
StoType,
19+
Currency,
1920
} from '../../types';
2021
import * as cappedStoFactoryModule from '../../entities/factories/CappedStoFactory';
2122
import * as utilsModule from '../../utils';
@@ -27,16 +28,17 @@ import { Wallet } from '../../Wallet';
2728
import { TransferErc20 } from '../../procedures';
2829
import { mockFactories } from '../../testUtils/mockFactories';
2930
import { CappedSto, SecurityToken } from '../../entities';
31+
import { PostTransactionResolver } from '../../PostTransactionResolver';
3032

3133
const params: LaunchCappedStoProcedureArgs = {
3234
symbol: 'TEST1',
3335
startDate: new Date(2030, 1),
3436
endDate: new Date(2031, 1),
3537
tokensOnSale: new BigNumber(1000),
3638
rate: new BigNumber(10),
37-
currency: CappedStoCurrency.ETH,
38-
storageWallet: '0x6666666666666666666666666666666666666666',
39-
treasuryWallet: '0x7777777777777777777777777777777777777777',
39+
currency: Currency.ETH,
40+
raisedFundsWallet: '0x6666666666666666666666666666666666666666',
41+
unsoldTokensWallet: '0x7777777777777777777777777777777777777777',
4042
};
4143

4244
const currentWallet = '0x8888888888888888888888888888888888888888';

‎src/procedures/__tests__/LaunchUsdTieredSto.ts

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import {
77
SecurityTokenEvents,
88
} from '@polymathnetwork/contract-wrappers';
99
import * as contractWrappersModule from '@polymathnetwork/contract-wrappers';
10-
import { LaunchUsdTieredSto } from '../../procedures/LaunchUsdTieredSto';
10+
import { LaunchTieredSto } from '../../procedures/LaunchTieredSto';
1111
import { Procedure } from '../Procedure';
1212
import { PolymathError } from '../../PolymathError';
1313
import {
1414
ErrorCode,
15-
LaunchUsdTieredStoProcedureArgs,
15+
LaunchTieredStoProcedureArgs,
1616
PolyTransactionTag,
1717
ProcedureType,
1818
StoType,
1919
} from '../../types';
20-
import * as usdTieredStoFactoryModule from '~/entities/factories/UsdTieredStoFactory';
20+
import * as tieredStoFactoryModule from '~/entities/factories/TieredStoFactory';
2121
import * as utilsModule from '../../utils';
2222
import * as contextModule from '../../Context';
2323
import * as wrappersModule from '../../PolymathBase';
@@ -26,14 +26,14 @@ import * as moduleWrapperFactoryModule from '../../testUtils/MockedModuleWrapper
2626
import { Wallet } from '../../Wallet';
2727
import { TransferErc20 } from '../../procedures';
2828
import { mockFactories } from '../../testUtils/mockFactories';
29-
import { SecurityToken, UsdTieredSto } from '../../entities';
29+
import { SecurityToken, TieredSto } from '../../entities';
3030

31-
const params: LaunchUsdTieredStoProcedureArgs = {
31+
const params: LaunchTieredStoProcedureArgs = {
3232
symbol: 'TEST1',
3333
startDate: new Date(2030, 1),
3434
endDate: new Date(2031, 1),
35-
storageWallet: '0x5555555555555555555555555555555555555555',
36-
treasuryWallet: '0x6666666666666666666666666666666666666666',
35+
raisedFundsWallet: '0x5555555555555555555555555555555555555555',
36+
unsoldTokensWallet: '0x6666666666666666666666666666666666666666',
3737
tiers: [
3838
{
3939
tokensOnSale: new BigNumber(1),
@@ -43,18 +43,18 @@ const params: LaunchUsdTieredStoProcedureArgs = {
4343
nonAccreditedInvestmentLimit: new BigNumber(1),
4444
minimumInvestment: new BigNumber(1),
4545
currencies: [Currency.StableCoin],
46-
usdTokenAddresses: ['0x7777777777777777777777777777777777777777'],
46+
stableCoinAddresses: ['0x7777777777777777777777777777777777777777'],
4747
};
4848

4949
const currentWallet = '0x8888888888888888888888888888888888888888';
5050
const securityTokenAddress = '0x9999999999999999999999999999999999999999';
5151
const polyTokenAddress = '0x5555555555555555555555555555555555555555';
5252
const moduleFactoryAddress = '0x4444444444444444444444444444444444444444';
5353
const costInPoly = new BigNumber(5);
54-
const costInUsd = new BigNumber(6);
54+
const costIn = new BigNumber(6);
5555

56-
describe('LaunchUsdTieredSto', () => {
57-
let target: LaunchUsdTieredSto;
56+
describe('LaunchTieredSto', () => {
57+
let target: LaunchTieredSto;
5858
let contextMock: MockManager<contextModule.Context>;
5959
let wrappersMock: MockManager<wrappersModule.PolymathBase>;
6060
let tokenFactoryMock: MockManager<tokenFactoryModule.MockedTokenFactoryModule>;
@@ -66,7 +66,7 @@ describe('LaunchUsdTieredSto', () => {
6666
let moduleWrapperFactoryStub: SinonStub<any, any>;
6767

6868
// Mock factories
69-
let usdTieredStoFactoryMock: MockManager<usdTieredStoFactoryModule.UsdTieredStoFactory>;
69+
let tieredStoFactoryMock: MockManager<tieredStoFactoryModule.TieredStoFactory>;
7070

7171
let securityTokenMock: MockManager<contractWrappersModule.SecurityToken_3_0_0>;
7272
let moduleFactoryMock: MockManager<contractWrappersModule.ModuleFactory_3_0_0>;
@@ -75,7 +75,7 @@ describe('LaunchUsdTieredSto', () => {
7575
let getAttachedModulesFactoryAddressStub: SinonStub<any, any>;
7676

7777
beforeEach(() => {
78-
// Mock the context, wrappers, and tokenFactory to test LaunchUsdTieredSto
78+
// Mock the context, wrappers, and tokenFactory to test LaunchTieredSto
7979
contextMock = ImportMock.mockClass(contextModule, 'Context');
8080
wrappersMock = ImportMock.mockClass(wrappersModule, 'PolymathBase');
8181
tokenFactoryMock = ImportMock.mockClass(tokenFactoryModule, 'MockedTokenFactoryModule');
@@ -95,7 +95,7 @@ describe('LaunchUsdTieredSto', () => {
9595
moduleFactoryMock = ImportMock.mockClass(contractWrappersModule, 'ModuleFactory_3_0_0');
9696
moduleFactoryMock.mock('setupCostInPoly', Promise.resolve(costInPoly));
9797
moduleFactoryMock.mock('isCostInPoly', Promise.resolve(false));
98-
moduleFactoryMock.mock('setupCost', Promise.resolve(costInUsd));
98+
moduleFactoryMock.mock('setupCost', Promise.resolve(costIn));
9999

100100
tokenFactoryStub = tokenFactoryMock.mock(
101101
'getSecurityTokenInstanceFromTicker',
@@ -105,13 +105,10 @@ describe('LaunchUsdTieredSto', () => {
105105
'getModuleFactory',
106106
moduleFactoryMock.getMockInstance()
107107
);
108-
usdTieredStoFactoryMock = ImportMock.mockClass(
109-
usdTieredStoFactoryModule,
110-
'UsdTieredStoFactory'
111-
);
108+
tieredStoFactoryMock = ImportMock.mockClass(tieredStoFactoryModule, 'TieredStoFactory');
112109

113110
const factoryMockSetup = mockFactories();
114-
factoryMockSetup.usdTieredStoFactory = usdTieredStoFactoryMock.getMockInstance();
111+
factoryMockSetup.tieredStoFactory = tieredStoFactoryMock.getMockInstance();
115112
contextMock.set('factories', factoryMockSetup);
116113
contextMock.set('currentWallet', new Wallet({ address: () => Promise.resolve(currentWallet) }));
117114

@@ -127,21 +124,21 @@ describe('LaunchUsdTieredSto', () => {
127124
Promise.resolve(moduleFactoryAddress)
128125
);
129126

130-
// Instantiate LaunchUsdTieredSto
131-
target = new LaunchUsdTieredSto(params, contextMock.getMockInstance());
127+
// Instantiate LaunchTieredSto
128+
target = new LaunchTieredSto(params, contextMock.getMockInstance());
132129
});
133130
afterEach(() => {
134131
restore();
135132
});
136133

137134
describe('Types', () => {
138-
test('should extend procedure and have LaunchUsdTieredSto type', async () => {
135+
test('should extend procedure and have LaunchTieredSto type', async () => {
139136
expect(target instanceof Procedure).toBe(true);
140-
expect(target.type).toBe(ProcedureType.LaunchUsdTieredSto);
137+
expect(target.type).toBe(ProcedureType.LaunchTieredSto);
141138
});
142139
});
143140

144-
describe('LaunchUsdTieredSto', () => {
141+
describe('LaunchTieredSto', () => {
145142
test('should add the transaction to the queue to launch usd tiered sto and add a procedure to transfer erc20 token', async () => {
146143
const addProcedureSpy = spy(target, 'addProcedure');
147144
const addTransactionSpy = spy(target, 'addTransaction');
@@ -157,12 +154,10 @@ describe('LaunchUsdTieredSto', () => {
157154
.calledWith(securityTokenMock.getMockInstance().addModuleWithLabel)
158155
).toEqual(true);
159156
expect(addTransactionSpy.getCall(0).lastArg.fees).toEqual({
160-
usd: costInUsd,
157+
usd: costIn,
161158
poly: costInPoly,
162159
});
163-
expect(addTransactionSpy.getCall(0).lastArg.tag).toEqual(
164-
PolyTransactionTag.EnableUsdTieredSto
165-
);
160+
expect(addTransactionSpy.getCall(0).lastArg.tag).toEqual(PolyTransactionTag.EnableTieredSto);
166161
expect(addTransactionSpy.callCount).toEqual(1);
167162
expect(addProcedureSpy.getCall(0).calledWithExactly(TransferErc20)).toEqual(true);
168163
expect(addProcedureSpy.callCount).toEqual(1);
@@ -187,9 +182,7 @@ describe('LaunchUsdTieredSto', () => {
187182
usd: null,
188183
poly: costInPoly,
189184
});
190-
expect(addTransactionSpy.getCall(0).lastArg.tag).toEqual(
191-
PolyTransactionTag.EnableUsdTieredSto
192-
);
185+
expect(addTransactionSpy.getCall(0).lastArg.tag).toEqual(PolyTransactionTag.EnableTieredSto);
193186
expect(addTransactionSpy.callCount).toEqual(1);
194187
expect(addProcedureSpy.getCall(0).calledWithExactly(TransferErc20)).toEqual(true);
195188
expect(addProcedureSpy.callCount).toEqual(1);
@@ -205,18 +198,18 @@ describe('LaunchUsdTieredSto', () => {
205198
new PolymathError({
206199
code: ErrorCode.UnexpectedEventLogs,
207200
message:
208-
"The USD Tiered STO was successfully launched but the corresponding event wasn't fired. Please report this issue to the Polymath team.",
201+
"The Tiered STO was successfully launched but the corresponding event wasn't fired. Please report this issue to the Polymath team.",
209202
})
210203
);
211204
});
212205

213206
test('should return the usd tiered sto object information', async () => {
214207
const stoObject = {
215208
securityTokenId: params.symbol,
216-
stoType: StoType.UsdTiered,
209+
stoType: StoType.Tiered,
217210
address: securityTokenAddress,
218211
};
219-
const fetchStub = usdTieredStoFactoryMock.mock('fetch', Promise.resolve(stoObject));
212+
const fetchStub = tieredStoFactoryMock.mock('fetch', Promise.resolve(stoObject));
220213
const moduleAddress = '0x3333333333333333333333333333333333333333';
221214
findEventsStub = ImportMock.mockFunction(utilsModule, 'findEvents', [
222215
{
@@ -235,11 +228,11 @@ describe('LaunchUsdTieredSto', () => {
235228
// Verification for fetch
236229
expect(
237230
fetchStub.getCall(0).calledWithExactly(
238-
UsdTieredSto.generateId({
231+
TieredSto.generateId({
239232
securityTokenId: SecurityToken.generateId({
240233
symbol: params.symbol,
241234
}),
242-
stoType: StoType.UsdTiered,
235+
stoType: StoType.Tiered,
243236
address: moduleAddress,
244237
})
245238
)

‎src/procedures/__tests__/PauseSto.ts

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ import {
1313
} from '../../types';
1414
import * as pauseStoModule from '../../procedures/PauseSto';
1515
import * as cappedStoFactoryModule from '../../entities/factories/CappedStoFactory';
16-
import * as usdTieredStoFactoryModule from '../../entities/factories/UsdTieredStoFactory';
16+
import * as tieredStoFactoryModule from '../../entities/factories/TieredStoFactory';
1717
import * as contextModule from '../../Context';
1818
import * as wrappersModule from '../../PolymathBase';
1919
import * as tokenFactoryModule from '../../testUtils/MockedTokenFactoryModule';
2020
import * as moduleWrapperFactoryModule from '../../testUtils/MockedModuleWrapperFactoryModule';
2121
import { mockFactories } from '../../testUtils/mockFactories';
2222
import { Factories } from '../../Context';
23-
import { CappedSto, SecurityToken, UsdTieredSto } from '../../entities';
23+
import { CappedSto, SecurityToken, TieredSto } from '../../entities';
2424

25-
const usdTieredParams: PauseStoProcedureArgs = {
25+
const tieredParams: PauseStoProcedureArgs = {
2626
symbol: 'TEST1',
2727
stoAddress: '0x6666666666666666666666666666666666666666',
28-
stoType: StoType.UsdTiered,
28+
stoType: StoType.Tiered,
2929
};
3030

3131
const cappedParams: PauseStoProcedureArgs = {
@@ -45,12 +45,12 @@ describe('PauseSto', () => {
4545
moduleWrapperFactoryModule.MockedModuleWrapperFactoryModule
4646
>;
4747
let cappedStoMock: MockManager<contractWrappersModule.CappedSTO_3_0_0>;
48-
let usdTieredStoMock: MockManager<contractWrappersModule.USDTieredSTO_3_0_0>;
48+
let tieredStoMock: MockManager<contractWrappersModule.USDTieredSTO_3_0_0>;
4949

5050
// Mock factories
5151
let cappedStoFactoryMock: MockManager<cappedStoFactoryModule.CappedStoFactory>;
5252

53-
let usdTieredStoFactoryMock: MockManager<usdTieredStoFactoryModule.UsdTieredStoFactory>;
53+
let tieredStoFactoryMock: MockManager<tieredStoFactoryModule.TieredStoFactory>;
5454

5555
let securityTokenMock: MockManager<contractWrappersModule.SecurityToken_3_0_0>;
5656

@@ -80,17 +80,14 @@ describe('PauseSto', () => {
8080

8181
cappedStoFactoryMock = ImportMock.mockClass(cappedStoFactoryModule, 'CappedStoFactory');
8282

83-
usdTieredStoFactoryMock = ImportMock.mockClass(
84-
usdTieredStoFactoryModule,
85-
'UsdTieredStoFactory'
86-
);
83+
tieredStoFactoryMock = ImportMock.mockClass(tieredStoFactoryModule, 'TieredStoFactory');
8784

8885
factoryMockSetup = mockFactories();
8986
factoryMockSetup.cappedStoFactory = cappedStoFactoryMock.getMockInstance();
90-
factoryMockSetup.usdTieredStoFactory = usdTieredStoFactoryMock.getMockInstance();
87+
factoryMockSetup.tieredStoFactory = tieredStoFactoryMock.getMockInstance();
9188
contextMock.set('factories', factoryMockSetup);
9289

93-
usdTieredStoMock = ImportMock.mockClass(contractWrappersModule, 'USDTieredSTO_3_0_0');
90+
tieredStoMock = ImportMock.mockClass(contractWrappersModule, 'USDTieredSTO_3_0_0');
9491
cappedStoMock = ImportMock.mockClass(contractWrappersModule, 'CappedSTO_3_0_0');
9592

9693
securityTokenId = SecurityToken.generateId({ symbol: cappedParams.symbol });
@@ -127,19 +124,19 @@ describe('PauseSto', () => {
127124
expect(addTransactionSpy.callCount).toEqual(1);
128125
});
129126

130-
test('should add the transaction to the queue to pause a usdTiered sto', async () => {
131-
moduleWrapperFactoryMock.mock('getModuleInstance', usdTieredStoMock.getMockInstance());
132-
target = new PauseSto(usdTieredParams, contextMock.getMockInstance());
127+
test('should add the transaction to the queue to pause a tiered sto', async () => {
128+
moduleWrapperFactoryMock.mock('getModuleInstance', tieredStoMock.getMockInstance());
129+
target = new PauseSto(tieredParams, contextMock.getMockInstance());
133130

134131
const addTransactionSpy = spy(target, 'addTransaction');
135-
usdTieredStoMock.mock('pause', Promise.resolve('Pause'));
132+
tieredStoMock.mock('pause', Promise.resolve('Pause'));
136133

137134
// Real call
138135
await target.prepareTransactions();
139136

140137
// Verifications
141138
expect(
142-
addTransactionSpy.getCall(0).calledWith(usdTieredStoMock.getMockInstance().pause)
139+
addTransactionSpy.getCall(0).calledWith(tieredStoMock.getMockInstance().pause)
143140
).toEqual(true);
144141
expect(addTransactionSpy.getCall(0).lastArg.tag).toEqual(PolyTransactionTag.PauseSto);
145142
expect(addTransactionSpy.callCount).toEqual(1);
@@ -184,7 +181,7 @@ describe('PauseSto', () => {
184181
await expect(target.prepareTransactions()).rejects.toThrow(
185182
new PolymathError({
186183
code: ErrorCode.ProcedureValidationError,
187-
message: `STO ${cappedParams.stoAddress} is either archived or hasn't been launched.`,
184+
message: `STO ${cappedParams.stoAddress} is either archived or hasn't been launched`,
188185
})
189186
);
190187
});
@@ -210,20 +207,20 @@ describe('PauseSto', () => {
210207
});
211208

212209
test('should successfully resolve pause sto with usd tiered sto params', async () => {
213-
target = new PauseSto(usdTieredParams, contextMock.getMockInstance());
214-
const refreshStub = usdTieredStoFactoryMock.mock('refresh', Promise.resolve());
210+
target = new PauseSto(tieredParams, contextMock.getMockInstance());
211+
const refreshStub = tieredStoFactoryMock.mock('refresh', Promise.resolve());
215212
await pauseStoModule.createPauseStoResolver(
216213
factoryMockSetup,
217-
usdTieredParams.symbol,
218-
usdTieredParams.stoType,
219-
usdTieredParams.stoAddress
214+
tieredParams.symbol,
215+
tieredParams.stoType,
216+
tieredParams.stoAddress
220217
)();
221218
expect(
222219
refreshStub.getCall(0).calledWithExactly(
223-
UsdTieredSto.generateId({
220+
TieredSto.generateId({
224221
securityTokenId,
225-
stoType: StoType.UsdTiered,
226-
address: usdTieredParams.stoAddress,
222+
stoType: StoType.Tiered,
223+
address: tieredParams.stoAddress,
227224
})
228225
)
229226
).toEqual(true);

0 commit comments

Comments
 (0)