Skip to content

Commit 2da16b5

Browse files
authored
refactor: Remove UMA interfaces lookup (#959)
These names change very rarely, and we only have need for a small number of the complete set.
1 parent 937e6e1 commit 2da16b5

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

test/TokenClient.Approval.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { interfaceName } from "@uma/common";
21
import { HubPoolClient, SpokePoolClient, TokenClient } from "../src/clients";
32
import {
43
Contract,
@@ -49,8 +48,8 @@ describe("TokenClient: Origin token approval", async function () {
4948
const store = await (
5049
await getContractFactory("Store", owner)
5150
).deploy({ rawValue: "0" }, { rawValue: "0" }, zeroAddress);
52-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.CollateralWhitelist), collateralWhitelist.address);
53-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.Store), store.address);
51+
await finder.changeImplementationAddress(utf8ToHex("CollateralWhitelist"), collateralWhitelist.address);
52+
await finder.changeImplementationAddress(utf8ToHex("Store"), store.address);
5453
({ hubPool, l1Token_1 } = await deployAndConfigureHubPool(owner, [], finder.address, zeroAddress));
5554
await collateralWhitelist.addToWhitelist(l1Token_1.address);
5655
await hubPool.setBond(l1Token_1.address, toBNWei("5"));

test/fixtures/UmaEcosystemFixture.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as utils from "@across-protocol/contracts-v2/dist/test-utils";
22
import { Contract } from "ethers";
33
import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
44
import { utf8ToHex, identifier, refundProposalLiveness } from "@across-protocol/contracts-v2/dist/test-utils";
5-
import { interfaceName } from "@uma/common";
65

76
export async function setupUmaEcosystem(owner: SignerWithAddress): Promise<{
87
timer: Contract;
@@ -25,11 +24,11 @@ export async function setupUmaEcosystem(owner: SignerWithAddress): Promise<{
2524
const store = await (
2625
await utils.getContractFactory("Store", owner)
2726
).deploy({ rawValue: "0" }, { rawValue: "0" }, timer.address);
28-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.CollateralWhitelist), collateralWhitelist.address);
29-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.IdentifierWhitelist), identifierWhitelist.address);
30-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.SkinnyOptimisticOracle), optimisticOracle.address);
31-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.Store), store.address);
32-
await finder.changeImplementationAddress(utf8ToHex(interfaceName.Oracle), mockOracle.address);
27+
await finder.changeImplementationAddress(utf8ToHex("CollateralWhitelist"), collateralWhitelist.address);
28+
await finder.changeImplementationAddress(utf8ToHex("IdentifierWhitelist"), identifierWhitelist.address);
29+
await finder.changeImplementationAddress(utf8ToHex("SkinnyOptimisticOracle"), optimisticOracle.address);
30+
await finder.changeImplementationAddress(utf8ToHex("Store"), store.address);
31+
await finder.changeImplementationAddress(utf8ToHex("Oracle"), mockOracle.address);
3332
await identifierWhitelist.addSupportedIdentifier(identifier);
3433
return {
3534
timer,

0 commit comments

Comments
 (0)