Update to use ContractWrappers + Infura instead of Etherscan

2 files changed, 24 insertions, 23 deletions

diff --git a/packages/pipeline/test/parsers/events/index_test.ts b/packages/pipeline/test/parsers/events/index_test.ts
index 7e439ce39..2a2db1a94 100644
--- a/packages/pipeline/test/parsers/events/index_test.ts
+++ b/packages/pipeline/test/parsers/events/index_test.ts
@@ -1,11 +1,11 @@
-import { ExchangeFillEventArgs } from '@0x/contract-wrappers';
-import { BigNumber } from '@0x/utils';
+import { ExchangeFillEventArgs } from '@0xproject/contract-wrappers';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 import 'mocha';
 
-import { ExchangeFillEvent } from '../../../src/entities';
-import { _convertToExchangeFillEvent } from '../../../src/parsers/events';
+import { ExchangeFillEvent } from '../../../src/entities/ExchangeFillEvent';
+import { _convertToEntity } from '../../../src/parsers/events';
 import { chaiSetup } from '../../utils/chai_setup';
 
 chaiSetup.configure();
@@ -13,7 +13,7 @@ const expect = chai.expect;
 
 // tslint:disable:custom-no-magic-numbers
 describe('exchange_events', () => {
-    describe('_convertToExchangeFillEvent', () => {
+    describe('_convertToEntity', () => {
         it('converts LogWithDecodedArgs to ExchangeFillEvent entity', () => {
             const input: LogWithDecodedArgs<ExchangeFillEventArgs> = {
                 logIndex: 102,
@@ -39,7 +39,7 @@ describe('exchange_events', () => {
                     makerAssetFilledAmount: new BigNumber('10000000000000000'),
                     takerAssetFilledAmount: new BigNumber('100000000000000000'),
                     makerFeePaid: new BigNumber('0'),
-                    takerFeePaid: new BigNumber('12345'),
+                    takerFeePaid: new BigNumber('0'),
                     orderHash: '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a',
                     makerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
                     takerAssetData: '0xf47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498',
@@ -51,15 +51,14 @@ describe('exchange_events', () => {
             expected.logIndex = 102;
             expected.rawData =
                 '0x000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000f6da68519f78b0d0bc93c701e86affcb75c92428000000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001600000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000024f47261b0000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f49800000000000000000000000000000000000000000000000000000000';
-            expected.transactionHash = '0x6dd106d002873746072fc5e496dd0fb2541b68c77bcf9184ae19a42fd33657fe';
             expected.makerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
             expected.takerAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.feeRecipientAddress = '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd';
+            expected.feeRecepientAddress = '0xc370d2a5920344aa6b7d8d11250e3e861434cbdd';
             expected.senderAddress = '0xf6da68519f78b0d0bc93c701e86affcb75c92428';
-            expected.makerAssetFilledAmount = new BigNumber('10000000000000000');
-            expected.takerAssetFilledAmount = new BigNumber('100000000000000000');
-            expected.makerFeePaid = new BigNumber('0');
-            expected.takerFeePaid = new BigNumber('12345');
+            expected.makerAssetFilledAmount = '10000000000000000';
+            expected.takerAssetFilledAmount = '100000000000000000';
+            expected.makerFeePaid = '0';
+            expected.takerFeePaid = '0';
             expected.orderHash = '0xab12ed2cbaa5615ab690b9da75a46e53ddfcf3f1a68655b5fe0d94c75a1aac4a';
             expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
             expected.makerAssetType = 'erc20';
@@ -71,7 +70,7 @@ describe('exchange_events', () => {
             expected.takerAssetProxyId = '0xf47261b0';
             expected.takerTokenAddress = '0xe41d2489571d322189246dafa5ebde1f4699f498';
             expected.takerTokenId = null;
-            const actual = _convertToExchangeFillEvent(input);
+            const actual = _convertToEntity(input);
             expect(actual).deep.equal(expected);
         });
     });
diff --git a/packages/pipeline/test/parsers/sra_orders/index_test.ts b/packages/pipeline/test/parsers/sra_orders/index_test.ts
index ee2842ef3..952a6f3c6 100644
--- a/packages/pipeline/test/parsers/sra_orders/index_test.ts
+++ b/packages/pipeline/test/parsers/sra_orders/index_test.ts
@@ -1,9 +1,9 @@
-import { APIOrder } from '@0x/types';
-import { BigNumber } from '@0x/utils';
+import { APIOrder } from '@0xproject/types';
+import { BigNumber } from '@0xproject/utils';
 import * as chai from 'chai';
 import 'mocha';
 
-import { SraOrder } from '../../../src/entities';
+import { SraOrder } from '../../../src/entities/SraOrder';
 import { _convertToEntity } from '../../../src/parsers/sra_orders';
 import { chaiSetup } from '../../utils/chai_setup';
 
@@ -37,16 +37,18 @@ describe('sra_orders', () => {
             const expected = new SraOrder();
             expected.exchangeAddress = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
             expected.orderHashHex = '0x1bdbeb0d088a33da28b9ee6d94e8771452f90f4a69107da2fa75195d61b9a1c9';
+            expected.lastUpdatedTimestamp = 0;
+            expected.firstSeenTimestamp = 0;
             expected.makerAddress = '0xb45df06e38540a675fdb5b598abf2c0dbe9d6b81';
             expected.takerAddress = '0x0000000000000000000000000000000000000000';
             expected.feeRecipientAddress = '0xa258b39954cef5cb142fd567a46cddb31a670124';
             expected.senderAddress = '0x0000000000000000000000000000000000000000';
-            expected.makerAssetAmount = new BigNumber('1619310371000000000');
-            expected.takerAssetAmount = new BigNumber('8178335207070707070707');
-            expected.makerFee = new BigNumber('0');
-            expected.takerFee = new BigNumber('0');
-            expected.expirationTimeSeconds = new BigNumber('1538529488');
-            expected.salt = new BigNumber('1537924688891');
+            expected.makerAssetAmount = '1619310371000000000';
+            expected.takerAssetAmount = '8178335207070707070707';
+            expected.makerFee = '0';
+            expected.takerFee = '0';
+            expected.expirationTimeSeconds = '1538529488';
+            expected.salt = '1537924688891';
             expected.signature =
                 '0x1b5a5d672b0d647b5797387ccbb89d822d5d2e873346b014f4ff816ff0783f2a7a0d2824d2d7042ec8ea375bc7f870963e1cb8248f1db03ddf125e27b5963aa11f03';
             expected.rawMakerAssetData = '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
@@ -59,7 +61,7 @@ describe('sra_orders', () => {
             expected.takerAssetProxyId = '0xf47261b0';
             expected.takerTokenAddress = '0x42d6622dece394b54999fbd73d108123806f6a18';
             expected.takerTokenId = null;
-            expected.metadataJson = '{"isThisArbitraryData":true,"powerLevel":9001}';
+            expected.metaDataJson = '{"isThisArbitraryData":true,"powerLevel":9001}';
 
             const actual = _convertToEntity(input);
             expect(actual).deep.equal(expected);