Skip to content

Commit

Permalink
add rollup processor address arg to yearn client
Browse files Browse the repository at this point in the history
  • Loading branch information
LHerskind committed Aug 23, 2022
1 parent e14a84e commit f0256c5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions src/client/yearn/yearn-bridge-data.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ describe("Testing Yearn auxData", () => {
};
IRollupProcessor__factory.connect = () => rollupProcessorContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());
const auxDataDepositERC20 = await yearnBridgeData.getAuxData(daiAsset, emptyAsset, yvDaiAsset, emptyAsset);
expect(auxDataDepositERC20[0]).toBe(0);
const auxDataDepositETH = await yearnBridgeData.getAuxData(ethAsset, emptyAsset, yvEthAsset, emptyAsset);
Expand Down Expand Up @@ -143,7 +143,7 @@ describe("Testing Yearn auxData", () => {
};
IRollupProcessor__factory.connect = () => rollupProcessorContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());
const auxDataDepositERC20 = await yearnBridgeData.getAuxData(yvDaiAsset, emptyAsset, daiAsset, emptyAsset);
expect(auxDataDepositERC20[0]).toBe(1);
const auxDataDepositETH = await yearnBridgeData.getAuxData(yvEthAsset, emptyAsset, ethAsset, emptyAsset);
Expand Down Expand Up @@ -174,7 +174,7 @@ describe("Testing Yearn auxData", () => {
};
IRollupProcessor__factory.connect = () => rollupProcessorContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

expect.assertions(1);
await expect(yearnBridgeData.getAuxData(yvDaiAsset, emptyAsset, ethAsset, emptyAsset)).rejects.toEqual(
Expand Down Expand Up @@ -206,7 +206,7 @@ describe("Testing Yearn auxData", () => {
};
IRollupProcessor__factory.connect = () => rollupProcessorContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

expect.assertions(1);
await expect(yearnBridgeData.getAuxData(ethAsset, emptyAsset, yvEthAsset, emptyAsset)).rejects.toEqual(
Expand Down Expand Up @@ -250,7 +250,7 @@ describe("Testing Yearn auxData", () => {
};
IRollupProcessor__factory.connect = () => rollupProcessorContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

expect.assertions(8);
await expect(yearnBridgeData.getAuxData(ethAsset, emptyAsset, yvDaiAsset, emptyAsset)).rejects.toEqual(
Expand Down Expand Up @@ -326,7 +326,7 @@ describe("Testing Yearn expectedOutput", () => {
};
IYearnVault__factory.connect = () => vaultContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

const expectedOutputERC20 = await yearnBridgeData.getExpectedOutput(
daiAsset,
Expand Down Expand Up @@ -360,7 +360,7 @@ describe("Testing Yearn expectedOutput", () => {
};
IYearnVault__factory.connect = () => vaultContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

const expectedOutputERC20 = await yearnBridgeData.getExpectedOutput(
yvDaiAsset,
Expand Down Expand Up @@ -394,7 +394,7 @@ describe("Testing Yearn expectedOutput", () => {
};
IYearnVault__factory.connect = () => vaultContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

expect.assertions(3);
await expect(
Expand All @@ -409,7 +409,7 @@ describe("Testing Yearn expectedOutput", () => {
});

it("should throw with incorrect tokens on the input", async () => {
const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());

await expect(
yearnBridgeData.getExpectedOutput(emptyAsset, emptyAsset, emptyAsset, emptyAsset, 0, 0n),
Expand Down Expand Up @@ -438,7 +438,7 @@ describe("Testing Yearn getAPR", () => {
});

it("should correctly compute APR", async () => {
const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());
const expectedAPRDai = await yearnBridgeData.getAPR(yvDaiAsset);
expect(expectedAPRDai).not.toBeUndefined();
expect(expectedAPRDai).toBeGreaterThan(0);
Expand Down Expand Up @@ -482,7 +482,7 @@ describe("Testing Yearn getMarketSize", () => {
};
IYearnVault__factory.connect = () => vaultContract as any;

const yearnBridgeData = YearnBridgeData.create({} as any);
const yearnBridgeData = YearnBridgeData.create({} as any, EthAddress.random());
const expectedMarketSize = (await yearnBridgeData.getMarketSize(daiAsset, emptyAsset, yvDaiAsset, emptyAsset, 0))[0]
.value;
expect(expectedMarketSize).toBe(97513214188808613008055674n);
Expand Down
4 changes: 2 additions & 2 deletions src/client/yearn/yearn-bridge-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ export class YearnBridgeData implements BridgeDataFieldGetters {
private rollupProcessor: IRollupProcessor,
) {}

static create(provider: EthereumProvider) {
static create(provider: EthereumProvider, rollupProcessor: EthAddress) {
const ethersProvider = createWeb3Provider(provider);
return new YearnBridgeData(
ethersProvider,
IYearnRegistry__factory.connect("0x50c1a2eA0a861A967D9d0FFE2AE4012c2E053804", ethersProvider),
IRollupProcessor__factory.connect("0xFF1F2B4ADb9dF6FC8eAFecDcbF96A2B351680455", ethersProvider),
IRollupProcessor__factory.connect(rollupProcessor.toString(), ethersProvider),
);
}

Expand Down

0 comments on commit f0256c5

Please sign in to comment.