aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/asset_proxy
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-01 07:31:00 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-06-08 06:38:48 +0800
commit249a1e6d8d129d6b067a4ddadfb4b94733ddfc07 (patch)
treeb4bc308a8653e14a67298cdf75c8d84278bb8195 /packages/contracts/test/asset_proxy
parente042e0ad32cd2ac9e707cb8e52961957f58314ce (diff)
downloaddexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar.gz
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar.bz2
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar.lz
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar.xz
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.tar.zst
dexon-sol-tools-249a1e6d8d129d6b067a4ddadfb4b94733ddfc07.zip
Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would
Diffstat (limited to 'packages/contracts/test/asset_proxy')
-rw-r--r--packages/contracts/test/asset_proxy/decoder.ts10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/contracts/test/asset_proxy/decoder.ts b/packages/contracts/test/asset_proxy/decoder.ts
index 712ef8656..8c1253d5c 100644
--- a/packages/contracts/test/asset_proxy/decoder.ts
+++ b/packages/contracts/test/asset_proxy/decoder.ts
@@ -7,12 +7,12 @@ import * as chai from 'chai';
import ethUtil = require('ethereumjs-util');
import * as Web3 from 'web3';
-import { TestLibAssetProxyDecoderContract } from '../../src/contract_wrappers/generated/test_lib_asset_proxy_decoder';
+import { TestAssetDataDecodersContract } from '../../src/contract_wrappers/generated/test_asset_data_decoders';
import { artifacts } from '../../src/utils/artifacts';
import { assetProxyUtils } from '../../src/utils/asset_proxy_utils';
import { chaiSetup } from '../../src/utils/chai_setup';
import { constants } from '../../src/utils/constants';
-import { AssetProxyId, ERC20AssetData, ERC721AssetData, AssetData } from '../../src/utils/types';
+import { AssetData, AssetProxyId, ERC20AssetData, ERC721AssetData } from '../../src/utils/types';
import { provider, txDefaults, web3Wrapper } from '../../src/utils/web3_wrapper';
chaiSetup.configure();
@@ -21,7 +21,7 @@ const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
describe('LibAssetProxyDecoder', () => {
let owner: string;
- let testAssetProxyDecoder: TestLibAssetProxyDecoderContract;
+ let testAssetProxyDecoder: TestAssetDataDecodersContract;
let testAddress: string;
before(async () => {
@@ -30,8 +30,8 @@ describe('LibAssetProxyDecoder', () => {
owner = accounts[0];
testAddress = accounts[1];
// Deploy TestLibMem
- testAssetProxyDecoder = await TestLibAssetProxyDecoderContract.deployFrom0xArtifactAsync(
- artifacts.TestLibAssetProxyDecoder,
+ testAssetProxyDecoder = await TestAssetDataDecodersContract.deployFrom0xArtifactAsync(
+ artifacts.TestAssetDataDecoders,
provider,
txDefaults,
);