-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1104 from multiversx/feat/governance-v2
Merge feat/governance-v2 into development
- Loading branch information
Showing
50 changed files
with
2,074 additions
and
423 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import { FarmAbiServiceV2 } from '../v2/services/farm.v2.abi.service'; | ||
import { FarmAbiServiceMock } from './farm.abi.service.mock'; | ||
import { IFarmAbiServiceV2 } from '../v2/services/interfaces'; | ||
import { BoostedYieldsFactors } from '../models/farm.v2.model'; | ||
|
||
export class FarmAbiServiceMockV2 | ||
extends FarmAbiServiceMock | ||
implements IFarmAbiServiceV2 | ||
{ | ||
async lastUndistributedBoostedRewardsCollectWeek( | ||
farmAddress: string, | ||
): Promise<number> { | ||
return 1; | ||
} | ||
async undistributedBoostedRewards(farmAddress: string): Promise<string> { | ||
return '5000'; | ||
} | ||
async remainingBoostedRewardsToDistribute( | ||
farmAddress: string, | ||
week: number, | ||
): Promise<string> { | ||
return '1000'; | ||
} | ||
|
||
accumulatedRewardsForWeek(scAddress: string, week: number): Promise<string> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
|
||
boostedYieldsFactors(farmAddress: string): Promise<BoostedYieldsFactors> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
|
||
boostedYieldsRewardsPercenatage(farmAddress: string): Promise<number> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
|
||
energyFactoryAddress(farmAddress: string): Promise<string> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
|
||
lockEpochs(farmAddress: string): Promise<number> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
|
||
lockingScAddress(farmAddress: string): Promise<string> { | ||
throw new Error('Method not implemented.'); | ||
} | ||
} | ||
|
||
|
||
export const FarmAbiServiceProviderV2 = { | ||
provide: FarmAbiServiceV2, | ||
useClass: FarmAbiServiceMockV2, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
import { BigNumber } from 'bignumber.js'; | ||
import { Test, TestingModule } from '@nestjs/testing'; | ||
import { FarmComputeServiceV2 } from '../v2/services/farm.v2.compute.service'; | ||
import { CommonAppModule } from '../../../common.app.module'; | ||
import { CachingModule } from '../../../services/caching/cache.module'; | ||
import { FarmAbiServiceProviderV2 } from '../mocks/farm.v2.abi.service.mock'; | ||
import { FarmServiceV2 } from '../v2/services/farm.v2.service'; | ||
import { MXDataApiServiceProvider } from '../../../services/multiversx-communication/mx.data.api.service.mock'; | ||
import { WrapAbiServiceProvider } from '../../wrapping/mocks/wrap.abi.service.mock'; | ||
import { RouterAbiServiceProvider } from '../../router/mocks/router.abi.service.mock'; | ||
import { TokenComputeService } from '../../tokens/services/token.compute.service'; | ||
import { TokenGetterServiceProvider } from '../../tokens/mocks/token.getter.service.mock'; | ||
import { PairComputeServiceProvider } from '../../pair/mocks/pair.compute.service.mock'; | ||
import { PairAbiServiceProvider } from '../../pair/mocks/pair.abi.service.mock'; | ||
import { PairService } from '../../pair/services/pair.service'; | ||
import { ContextGetterServiceProvider } from '../../../services/context/mocks/context.getter.service.mock'; | ||
import { MXApiServiceProvider } from '../../../services/multiversx-communication/mx.api.service.mock'; | ||
import { | ||
WeekTimekeepingAbiServiceProvider, | ||
} from '../../../submodules/week-timekeeping/mocks/week.timekeeping.abi.service.mock'; | ||
import { | ||
WeekTimekeepingComputeService, | ||
} from '../../../submodules/week-timekeeping/services/week-timekeeping.compute.service'; | ||
import { | ||
WeeklyRewardsSplittingAbiServiceProvider, | ||
} from '../../../submodules/weekly-rewards-splitting/mocks/weekly.rewards.splitting.abi.mock'; | ||
import { | ||
WeeklyRewardsSplittingComputeService, | ||
} from '../../../submodules/weekly-rewards-splitting/services/weekly-rewards-splitting.compute.service'; | ||
import { EnergyAbiServiceProvider } from '../../energy/mocks/energy.abi.service.mock'; | ||
|
||
describe('FarmServiceV2', () => { | ||
let module: TestingModule; | ||
|
||
beforeEach(async () => { | ||
module = await Test.createTestingModule({ | ||
imports: [CommonAppModule, CachingModule], | ||
providers: [ | ||
MXApiServiceProvider, | ||
ContextGetterServiceProvider, | ||
PairService, | ||
PairAbiServiceProvider, | ||
PairComputeServiceProvider, | ||
TokenGetterServiceProvider, | ||
TokenComputeService, | ||
RouterAbiServiceProvider, | ||
WrapAbiServiceProvider, | ||
MXDataApiServiceProvider, | ||
WeekTimekeepingAbiServiceProvider, | ||
WeekTimekeepingComputeService, | ||
WeeklyRewardsSplittingAbiServiceProvider, | ||
EnergyAbiServiceProvider, | ||
WeeklyRewardsSplittingComputeService, | ||
FarmComputeServiceV2, | ||
FarmAbiServiceProviderV2, | ||
FarmServiceV2, | ||
], | ||
}).compile(); | ||
}); | ||
it("should correctly calculate total rewards", async () => { | ||
const service = module.get<FarmComputeServiceV2>( | ||
FarmComputeServiceV2, | ||
); | ||
const result = await service.undistributedBoostedRewards('erd18h5dulxp5zdp80qjndd2w25kufx0rm5yqd2h7ajrfucjhr82y8vqyq0hye', 10); | ||
const expectedTotal = new BigNumber('5000').plus('4000').integerValue().toFixed(); // 4 weeks * 1000 | ||
expect(result).toEqual(expectedTotal); | ||
// expect(mockFarmAbi.undistributedBoostedRewards).toHaveBeenCalled(); | ||
// expect(mockFarmAbi.lastUndistributedBoostedRewardsCollectWeek).toHaveBeenCalled(); | ||
// expect(mockFarmAbi.remainingBoostedRewardsToDistribute).toHaveBeenCalledTimes(4); | ||
}); | ||
// it("should return undistributedBoostedRewards if firstWeek > lastWeek", async () => { | ||
// const service = module.get<FarmComputeServiceV2>( | ||
// FarmComputeServiceV2, | ||
// ); | ||
// const result = await service.computeUndistributedBoostedRewards('erd18h5dulxp5zdp80qjndd2w25kufx0rm5yqd2h7ajrfucjhr82y8vqyq0hye', 5); | ||
// expect(result).toEqual('5000'); | ||
// // expect(mockFarmAbi.undistributedBoostedRewards).toHaveBeenCalled(); | ||
// // expect(mockFarmAbi.lastUndistributedBoostedRewardsCollectWeek).toHaveBeenCalled(); | ||
// }, 10000); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.