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

Commit fb0d174

Browse files
monitz87monitz87
committed
fix: 🐛 finish fixing remnants of merge conflicts
1 parent d562dd7 commit fb0d174

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

‎src/contract_wrappers/modules/module_wrapper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class ModuleWrapper extends ContractWrapper {
3838
return this.contractFactory.getPolyTokenContract();
3939
};
4040

41-
protected detailedErc20TokenContract = async (address: string): Promise<ERC20DetailedContract> => {
41+
protected detailedERC20TokenContract = async (address: string): Promise<ERC20DetailedContract> => {
4242
return this.contractFactory.getERC20DetailedContract(address);
4343
};
4444

‎src/contract_wrappers/modules/sto/__tests__/usd_tiered_sto_wrapper.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ describe('USDTieredSTOWrapper', () => {
356356
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
357357
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
358358
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
359-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
359+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
360360
expectedGetModulesByNameAddress,
361361
);
362362
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -456,7 +456,7 @@ describe('USDTieredSTOWrapper', () => {
456456
verify(mockedDecimalsMethod.callAsync()).once();
457457
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
458458
verify(mockedSecurityTokenContract.getModulesByName).once();
459-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
459+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
460460
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
461461
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
462462
verify(mockedContract.getAccreditedData).once();
@@ -521,7 +521,7 @@ describe('USDTieredSTOWrapper', () => {
521521
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
522522
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
523523
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
524-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
524+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
525525
expectedGetModulesByNameAddress,
526526
);
527527
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -678,7 +678,7 @@ describe('USDTieredSTOWrapper', () => {
678678
verify(mockedDecimalsMethod.callAsync()).once();
679679
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
680680
verify(mockedSecurityTokenContract.getModulesByName).once();
681-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
681+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
682682
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
683683
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
684684
verify(mockedContract.getAccreditedData).once();
@@ -743,7 +743,7 @@ describe('USDTieredSTOWrapper', () => {
743743
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
744744
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
745745
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
746-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
746+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
747747
expectedGetModulesByNameAddress,
748748
);
749749
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -905,7 +905,7 @@ describe('USDTieredSTOWrapper', () => {
905905
verify(mockedDecimalsMethod.callAsync()).once();
906906
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
907907
verify(mockedSecurityTokenContract.getModulesByName).once();
908-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
908+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
909909
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
910910
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
911911
verify(mockedContract.getAccreditedData).once();
@@ -972,7 +972,7 @@ describe('USDTieredSTOWrapper', () => {
972972
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
973973
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
974974
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
975-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
975+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
976976
expectedGetModulesByNameAddress,
977977
);
978978
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -1121,7 +1121,7 @@ describe('USDTieredSTOWrapper', () => {
11211121
verify(mockedDecimalsMethod.callAsync()).once();
11221122
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
11231123
verify(mockedSecurityTokenContract.getModulesByName).once();
1124-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
1124+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
11251125
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
11261126
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
11271127
verify(mockedContract.getAccreditedData).once();
@@ -1186,7 +1186,7 @@ describe('USDTieredSTOWrapper', () => {
11861186
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
11871187
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
11881188
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
1189-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
1189+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
11901190
expectedGetModulesByNameAddress,
11911191
);
11921192
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -1341,7 +1341,7 @@ describe('USDTieredSTOWrapper', () => {
13411341
verify(mockedDecimalsMethod.callAsync()).once();
13421342
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
13431343
verify(mockedSecurityTokenContract.getModulesByName).once();
1344-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
1344+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
13451345
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
13461346
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
13471347
verify(mockedContract.getAccreditedData).once();
@@ -1406,7 +1406,7 @@ describe('USDTieredSTOWrapper', () => {
14061406
const expectedGetModulesByNameAddress = [expectedGeneralTMAddress];
14071407
const mockedGetModulesByNameMethod = mock(MockedCallMethod);
14081408
when(mockedSecurityTokenContract.getModulesByName).thenReturn(instance(mockedGetModulesByNameMethod));
1409-
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).thenResolve(
1409+
when(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).thenResolve(
14101410
expectedGetModulesByNameAddress,
14111411
);
14121412
when(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).thenResolve(
@@ -1565,7 +1565,7 @@ describe('USDTieredSTOWrapper', () => {
15651565
verify(mockedDecimalsMethod.callAsync()).once();
15661566
verify(mockedContractFactory.getGeneralTransferManagerContract(expectedGeneralTMAddress)).once();
15671567
verify(mockedSecurityTokenContract.getModulesByName).once();
1568-
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.generalTransferManager))).once();
1568+
verify(mockedGetModulesByNameMethod.callAsync(stringToBytes32(ModuleName.GeneralTransferManager))).once();
15691569
verify(mockedGeneralTransferManagerContract.getInvestorFlag).once();
15701570
verify(mockedInvestorFlagMethod.callAsync(investorAddress, 0)).once();
15711571
verify(mockedContract.getAccreditedData).once();

‎src/contract_wrappers/modules/sto/usd_tiered_sto_wrapper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ export default class USDTieredSTOWrapper extends STOWrapper {
989989
assert.assert(investedUSD.plus(investorInvestedUSD).isGreaterThan(minimumInvestmentUSD), 'Investment < min');
990990

991991
const generalTMAddress = await (await this.securityTokenContract()).getModulesByName.callAsync(
992-
stringToBytes32(ModuleName.generalTransferManager),
992+
stringToBytes32(ModuleName.GeneralTransferManager),
993993
);
994994
const generalTM = new GeneralTransferManagerWrapper(
995995
this.web3Wrapper,

0 commit comments

Comments
 (0)