aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/contracts/src/utils/asset_proxy_utils.ts2
-rw-r--r--packages/contracts/src/utils/types.ts4
-rw-r--r--packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts2
-rw-r--r--packages/contracts/test/asset_proxy_dispatcher/proxies.ts8
-rw-r--r--packages/contracts/test/exchange/core.ts4
5 files changed, 10 insertions, 10 deletions
diff --git a/packages/contracts/src/utils/asset_proxy_utils.ts b/packages/contracts/src/utils/asset_proxy_utils.ts
index 7011e0e39..63de7252d 100644
--- a/packages/contracts/src/utils/asset_proxy_utils.ts
+++ b/packages/contracts/src/utils/asset_proxy_utils.ts
@@ -25,7 +25,7 @@ export function encodeUint256(value: BigNumber): Buffer {
}
export function encodeERC20V1ProxyData(tokenAddress: string): string {
- const encodedAssetProxyId = encodeAssetProxyId(AssetProxyId.ERC20_V1);
+ const encodedAssetProxyId = encodeAssetProxyId(AssetProxyId.ERC20V1);
const encodedAddress = encodeAddress(tokenAddress);
const encodedMetadata = Buffer.concat([encodedAssetProxyId, encodedAddress]);
const encodedMetadataHex = ethUtil.bufferToHex(encodedMetadata);
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index 8cfde8a07..f51dd5a1d 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -39,7 +39,7 @@ export interface CancelOrdersBefore {
export enum AssetProxyId {
INVALID,
- ERC20_V1,
+ ERC20V1,
ERC20,
ERC721,
}
@@ -111,7 +111,7 @@ export enum ContractName {
Arbitrage = 'Arbitrage',
AssetProxyDispatcher = 'AssetProxyDispatcher',
ERC20Proxy = 'ERC20Proxy',
- ERC20Proxy_V1 = 'ERC20Proxy_v1',
+ ERC20V1Proxy = 'ERC20Proxy_v1',
ERC721Proxy = 'ERC721Proxy',
DummyERC721Token = 'DummyERC721Token',
}
diff --git a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts b/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
index 919ecefa9..f466670a8 100644
--- a/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
+++ b/packages/contracts/test/asset_proxy_dispatcher/dispatcher.ts
@@ -66,7 +66,7 @@ describe('AssetProxyDispatcher', () => {
provider,
);
// Deploy ERC20 V1 Proxy
- const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
+ const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20V1Proxy, [
tokenTransferProxy.address,
]);
erc20TransferProxyV1 = new ERC20Proxy_v1Contract(
diff --git a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts b/packages/contracts/test/asset_proxy_dispatcher/proxies.ts
index fd2f2c26a..72516fd2e 100644
--- a/packages/contracts/test/asset_proxy_dispatcher/proxies.ts
+++ b/packages/contracts/test/asset_proxy_dispatcher/proxies.ts
@@ -57,7 +57,7 @@ describe('Asset Transfer Proxies', () => {
provider,
);
// Deploy ERC20 V1 Proxy
- const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
+ const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20V1Proxy, [
tokenTransferProxy.address,
]);
erc20TransferProxyV1 = new ERC20Proxy_v1Contract(
@@ -122,9 +122,9 @@ describe('Asset Transfer Proxies', () => {
afterEach(async () => {
await blockchainLifecycle.revertAsync();
});
- describe('Transfer Proxy - ERC20_V1', () => {
+ describe('Transfer Proxy - ERC20V1', () => {
it('should successfully encode/decode metadata', async () => {
- const metadata = await erc20TransferProxyV1.encodeMetadata.callAsync(AssetProxyId.ERC20_V1, zrx.address);
+ const metadata = await erc20TransferProxyV1.encodeMetadata.callAsync(AssetProxyId.ERC20V1, zrx.address);
const address = await erc20TransferProxyV1.decodeMetadata.callAsync(metadata);
expect(address).to.be.equal(zrx.address);
});
@@ -137,7 +137,7 @@ describe('Asset Transfer Proxies', () => {
it('should successfully encode/decode metadata padded with zeros', async () => {
const testAddress = '0x0000000000000000056000000000000000000010';
- const metadata = await erc20TransferProxyV1.encodeMetadata.callAsync(AssetProxyId.ERC20_V1, testAddress);
+ const metadata = await erc20TransferProxyV1.encodeMetadata.callAsync(AssetProxyId.ERC20V1, testAddress);
const address = await erc20TransferProxyV1.decodeMetadata.callAsync(metadata);
expect(address).to.be.equal(testAddress);
});
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 17e378452..2c12f35b7 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -100,7 +100,7 @@ describe('Exchange', () => {
provider,
);
// Deploy ERC20 V1 Proxy
- const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20Proxy_V1, [
+ const erc20TransferProxyV1Instance = await deployer.deployAsync(ContractName.ERC20V1Proxy, [
tokenTransferProxy.address,
]);
erc20TransferProxyV1 = new ERC20Proxy_v1Contract(
@@ -115,7 +115,7 @@ describe('Exchange', () => {
from: accounts[0],
});
await assetProxyDispatcher.addAssetProxy.sendTransactionAsync(
- AssetProxyId.ERC20_V1,
+ AssetProxyId.ERC20V1,
erc20TransferProxyV1.address,
ZeroEx.NULL_ADDRESS,
{ from: accounts[0] },