Reorganize entities. Make scripts work from any directory.

8 files changed, 89 insertions, 289 deletions

diff --git a/packages/pipeline/src/entities/ExchangeCancelEvent.ts b/packages/pipeline/src/entities/ExchangeCancelEvent.ts
deleted file mode 100644
index 698b9e2ec..000000000
--- a/packages/pipeline/src/entities/ExchangeCancelEvent.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-
-import { AssetType } from '../types';
-
-@Entity()
-export class ExchangeCancelEvent {
-    @PrimaryColumn() public contractAddress!: string;
-    @PrimaryColumn() public logIndex!: number;
-    @PrimaryColumn() public blockNumber!: number;
-
-    @Column() public rawData!: string;
-
-    // TODO(albrow): Include transaction hash
-    @Column() public makerAddress!: string;
-    @Column({ nullable: true, type: String })
-    public takerAddress!: string;
-    @Column() public feeRecepientAddress!: string;
-    @Column() public senderAddress!: string;
-    @Column() public orderHash!: string;
-
-    @Column() public rawMakerAssetData!: string;
-    @Column() public makerAssetType!: AssetType;
-    @Column() public makerAssetProxyId!: string;
-    @Column() public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public makerTokenId!: string | null;
-    @Column() public rawTakerAssetData!: string;
-    @Column() public takerAssetType!: AssetType;
-    @Column() public takerAssetProxyId!: string;
-    @Column() public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public takerTokenId!: string | null;
-
-    // TODO(albrow): Include topics?
-}
diff --git a/packages/pipeline/src/entities/ExchangeCancelUpToEvent.ts b/packages/pipeline/src/entities/ExchangeCancelUpToEvent.ts
deleted file mode 100644
index 3ca75ccf7..000000000
--- a/packages/pipeline/src/entities/ExchangeCancelUpToEvent.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-
-@Entity()
-export class ExchangeCancelUpToEvent {
-    @PrimaryColumn() public contractAddress!: string;
-    @PrimaryColumn() public logIndex!: number;
-    @PrimaryColumn() public blockNumber!: number;
-
-    // TODO(albrow): Include transaction hash
-    @Column() public rawData!: string;
-
-    @Column() public makerAddress!: string;
-    @Column() public senderAddress!: string;
-    @Column() public orderEpoch!: string;
-    // TODO(albrow): Include topics?
-}
diff --git a/packages/pipeline/src/entities/ExchangeFillEvent.ts b/packages/pipeline/src/entities/ExchangeFillEvent.ts
deleted file mode 100644
index 6e549af93..000000000
--- a/packages/pipeline/src/entities/ExchangeFillEvent.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-
-import { AssetType } from '../types';
-
-@Entity()
-export class ExchangeFillEvent {
-    @PrimaryColumn() public contractAddress!: string;
-    @PrimaryColumn() public logIndex!: number;
-    @PrimaryColumn() public blockNumber!: number;
-
-    @Column() public rawData!: string;
-
-    @Column() public transactionHash!: string;
-    @Column() public makerAddress!: string;
-    @Column() public takerAddress!: string;
-    @Column() public feeRecipientAddress!: string;
-    @Column() public senderAddress!: string;
-    @Column() public makerAssetFilledAmount!: string;
-    @Column() public takerAssetFilledAmount!: string;
-    @Column() public makerFeePaid!: string;
-    @Column() public takerFeePaid!: string;
-    @Column() public orderHash!: string;
-
-    @Column() public rawMakerAssetData!: string;
-    @Column() public makerAssetType!: AssetType;
-    @Column() public makerAssetProxyId!: string;
-    @Column() public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public makerTokenId!: string | null;
-    @Column() public rawTakerAssetData!: string;
-    @Column() public takerAssetType!: AssetType;
-    @Column() public takerAssetProxyId!: string;
-    @Column() public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public takerTokenId!: string | null;
-
-    // TODO(albrow): Include topics?
-}
diff --git a/packages/pipeline/src/entities/SraOrder.ts b/packages/pipeline/src/entities/SraOrder.ts
deleted file mode 100644
index a22f7c4e5..000000000
--- a/packages/pipeline/src/entities/SraOrder.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Column, Entity, PrimaryColumn } from 'typeorm';
-
-import { AssetType } from '../types';
-
-@Entity()
-export class SraOrder {
-    @PrimaryColumn() public exchangeAddress!: string;
-    @PrimaryColumn() public orderHashHex!: string;
-
-    @Column() public sourceUrl!: string;
-    @Column() public lastUpdatedTimestamp!: number;
-    @Column() public firstSeenTimestamp!: number;
-
-    @Column() public makerAddress!: string;
-    @Column() public takerAddress!: string;
-    @Column() public feeRecipientAddress!: string;
-    @Column() public senderAddress!: string;
-    @Column() public makerAssetAmount!: string;
-    @Column() public takerAssetAmount!: string;
-    @Column() public makerFee!: string;
-    @Column() public takerFee!: string;
-    @Column() public expirationTimeSeconds!: string;
-    @Column() public salt!: string;
-    @Column() public signature!: string;
-
-    @Column() public rawMakerAssetData!: string;
-    @Column() public makerAssetType!: AssetType;
-    @Column() public makerAssetProxyId!: string;
-    @Column() public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public makerTokenId!: string | null;
-    @Column() public rawTakerAssetData!: string;
-    @Column() public takerAssetType!: AssetType;
-    @Column() public takerAssetProxyId!: string;
-    @Column() public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String })
-    public takerTokenId!: string | null;
-
-    // TODO(albrow): Make this optional?
-    @Column() public metaDataJson!: string;
-}
diff --git a/packages/pipeline/src/entities/exchange_cancel_event.ts b/packages/pipeline/src/entities/exchange_cancel_event.ts
index 38f99c903..698b9e2ec 100644
--- a/packages/pipeline/src/entities/exchange_cancel_event.ts
+++ b/packages/pipeline/src/entities/exchange_cancel_event.ts
@@ -1,51 +1,35 @@
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 
 import { AssetType } from '../types';
-import { numberToBigIntTransformer } from '../utils';
 
-@Entity({ name: 'exchange_cancel_events', schema: 'raw' })
+@Entity()
 export class ExchangeCancelEvent {
-    @PrimaryColumn({ name: 'contract_address' })
-    public contractAddress!: string;
-    @PrimaryColumn({ name: 'log_index' })
-    public logIndex!: number;
-    @PrimaryColumn({ name: 'block_number', transformer: numberToBigIntTransformer })
-    public blockNumber!: number;
+    @PrimaryColumn() public contractAddress!: string;
+    @PrimaryColumn() public logIndex!: number;
+    @PrimaryColumn() public blockNumber!: number;
 
-    @Column({ name: 'raw_data' })
-    public rawData!: string;
+    @Column() public rawData!: string;
 
-    @Column({ name: 'transaction_hash' })
-    public transactionHash!: string;
-    @Column({ name: 'maker_address' })
-    public makerAddress!: string;
-    @Column({ nullable: true, type: String, name: 'taker_address' })
+    // TODO(albrow): Include transaction hash
+    @Column() public makerAddress!: string;
+    @Column({ nullable: true, type: String })
     public takerAddress!: string;
-    @Column({ name: 'fee_recipient_address' })
-    public feeRecipientAddress!: string;
-    @Column({ name: 'sender_address' })
-    public senderAddress!: string;
-    @Column({ name: 'order_hash' })
-    public orderHash!: string;
+    @Column() public feeRecepientAddress!: string;
+    @Column() public senderAddress!: string;
+    @Column() public orderHash!: string;
 
-    @Column({ name: 'raw_maker_asset_data' })
-    public rawMakerAssetData!: string;
-    @Column({ name: 'maker_asset_type' })
-    public makerAssetType!: AssetType;
-    @Column({ name: 'maker_asset_proxy_id' })
-    public makerAssetProxyId!: string;
-    @Column({ name: 'maker_token_address' })
-    public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'maker_token_id' })
+    @Column() public rawMakerAssetData!: string;
+    @Column() public makerAssetType!: AssetType;
+    @Column() public makerAssetProxyId!: string;
+    @Column() public makerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public makerTokenId!: string | null;
-    @Column({ name: 'raw_taker_asset_data' })
-    public rawTakerAssetData!: string;
-    @Column({ name: 'taker_asset_type' })
-    public takerAssetType!: AssetType;
-    @Column({ name: 'taker_asset_proxy_id' })
-    public takerAssetProxyId!: string;
-    @Column({ name: 'taker_token_address' })
-    public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'taker_token_id' })
+    @Column() public rawTakerAssetData!: string;
+    @Column() public takerAssetType!: AssetType;
+    @Column() public takerAssetProxyId!: string;
+    @Column() public takerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public takerTokenId!: string | null;
+
+    // TODO(albrow): Include topics?
 }
diff --git a/packages/pipeline/src/entities/exchange_cancel_up_to_event.ts b/packages/pipeline/src/entities/exchange_cancel_up_to_event.ts
index 27580305e..3ca75ccf7 100644
--- a/packages/pipeline/src/entities/exchange_cancel_up_to_event.ts
+++ b/packages/pipeline/src/entities/exchange_cancel_up_to_event.ts
@@ -1,26 +1,16 @@
-import { BigNumber } from '@0x/utils';
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 
-import { bigNumberTransformer, numberToBigIntTransformer } from '../utils';
-
-@Entity({ name: 'exchange_cancel_up_to_events', schema: 'raw' })
+@Entity()
 export class ExchangeCancelUpToEvent {
-    @PrimaryColumn({ name: 'contract_address' })
-    public contractAddress!: string;
-    @PrimaryColumn({ name: 'log_index' })
-    public logIndex!: number;
-    @PrimaryColumn({ name: 'block_number', transformer: numberToBigIntTransformer })
-    public blockNumber!: number;
+    @PrimaryColumn() public contractAddress!: string;
+    @PrimaryColumn() public logIndex!: number;
+    @PrimaryColumn() public blockNumber!: number;
 
-    @Column({ name: 'raw_data' })
-    public rawData!: string;
+    // TODO(albrow): Include transaction hash
+    @Column() public rawData!: string;
 
-    @Column({ name: 'transaction_hash' })
-    public transactionHash!: string;
-    @Column({ name: 'maker_address' })
-    public makerAddress!: string;
-    @Column({ name: 'sender_address' })
-    public senderAddress!: string;
-    @Column({ name: 'order_epoch', type: 'numeric', transformer: bigNumberTransformer })
-    public orderEpoch!: BigNumber;
+    @Column() public makerAddress!: string;
+    @Column() public senderAddress!: string;
+    @Column() public orderEpoch!: string;
+    // TODO(albrow): Include topics?
 }
diff --git a/packages/pipeline/src/entities/exchange_fill_event.ts b/packages/pipeline/src/entities/exchange_fill_event.ts
index 9b7727615..6e549af93 100644
--- a/packages/pipeline/src/entities/exchange_fill_event.ts
+++ b/packages/pipeline/src/entities/exchange_fill_event.ts
@@ -1,60 +1,38 @@
-import { BigNumber } from '@0x/utils';
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 
 import { AssetType } from '../types';
-import { bigNumberTransformer, numberToBigIntTransformer } from '../utils';
 
-@Entity({ name: 'exchange_fill_events', schema: 'raw' })
+@Entity()
 export class ExchangeFillEvent {
-    @PrimaryColumn({ name: 'contract_address' })
-    public contractAddress!: string;
-    @PrimaryColumn({ name: 'log_index' })
-    public logIndex!: number;
-    @PrimaryColumn({ name: 'block_number', transformer: numberToBigIntTransformer })
-    public blockNumber!: number;
+    @PrimaryColumn() public contractAddress!: string;
+    @PrimaryColumn() public logIndex!: number;
+    @PrimaryColumn() public blockNumber!: number;
 
-    @Column({ name: 'raw_data' })
-    public rawData!: string;
+    @Column() public rawData!: string;
 
-    @Column({ name: 'transaction_hash' })
-    public transactionHash!: string;
-    @Column({ name: 'maker_address' })
-    public makerAddress!: string;
-    @Column({ name: 'taker_address' })
-    public takerAddress!: string;
-    @Column({ name: 'fee_recipient_address' })
-    public feeRecipientAddress!: string;
-    @Column({ name: 'sender_address' })
-    public senderAddress!: string;
-    @Column({ name: 'maker_asset_filled_amount', type: 'numeric', transformer: bigNumberTransformer })
-    public makerAssetFilledAmount!: BigNumber;
-    @Column({ name: 'taker_asset_filled_amount', type: 'numeric', transformer: bigNumberTransformer })
-    public takerAssetFilledAmount!: BigNumber;
-    @Column({ name: 'maker_fee_paid', type: 'numeric', transformer: bigNumberTransformer })
-    public makerFeePaid!: BigNumber;
-    @Column({ name: 'taker_fee_paid', type: 'numeric', transformer: bigNumberTransformer })
-    public takerFeePaid!: BigNumber;
-    @Column({ name: 'order_hash' })
-    public orderHash!: string;
+    @Column() public transactionHash!: string;
+    @Column() public makerAddress!: string;
+    @Column() public takerAddress!: string;
+    @Column() public feeRecipientAddress!: string;
+    @Column() public senderAddress!: string;
+    @Column() public makerAssetFilledAmount!: string;
+    @Column() public takerAssetFilledAmount!: string;
+    @Column() public makerFeePaid!: string;
+    @Column() public takerFeePaid!: string;
+    @Column() public orderHash!: string;
 
-    @Column({ name: 'raw_maker_asset_data' })
-    public rawMakerAssetData!: string;
-    @Column({ name: 'maker_asset_type' })
-    public makerAssetType!: AssetType;
-    @Column({ name: 'maker_asset_proxy_id' })
-    public makerAssetProxyId!: string;
-    @Column({ name: 'maker_token_address' })
-    public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'maker_token_id' })
+    @Column() public rawMakerAssetData!: string;
+    @Column() public makerAssetType!: AssetType;
+    @Column() public makerAssetProxyId!: string;
+    @Column() public makerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public makerTokenId!: string | null;
-    @Column({ name: 'raw_taker_asset_data' })
-    public rawTakerAssetData!: string;
-    @Column({ name: 'taker_asset_type' })
-    public takerAssetType!: AssetType;
-    @Column({ name: 'taker_asset_proxy_id' })
-    public takerAssetProxyId!: string;
-    @Column({ name: 'taker_token_address' })
-    public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'taker_token_id' })
+    @Column() public rawTakerAssetData!: string;
+    @Column() public takerAssetType!: AssetType;
+    @Column() public takerAssetProxyId!: string;
+    @Column() public takerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public takerTokenId!: string | null;
+
+    // TODO(albrow): Include topics?
 }
diff --git a/packages/pipeline/src/entities/sra_order.ts b/packages/pipeline/src/entities/sra_order.ts
index 9c730a0bb..a22f7c4e5 100644
--- a/packages/pipeline/src/entities/sra_order.ts
+++ b/packages/pipeline/src/entities/sra_order.ts
@@ -1,63 +1,41 @@
-import { BigNumber } from '@0x/utils';
 import { Column, Entity, PrimaryColumn } from 'typeorm';
 
 import { AssetType } from '../types';
-import { bigNumberTransformer } from '../utils';
 
-@Entity({ name: 'sra_orders', schema: 'raw' })
+@Entity()
 export class SraOrder {
-    @PrimaryColumn({ name: 'exchange_address' })
-    public exchangeAddress!: string;
-    @PrimaryColumn({ name: 'order_hash_hex' })
-    public orderHashHex!: string;
-    @PrimaryColumn({ name: 'source_url' })
-    public sourceUrl!: string;
+    @PrimaryColumn() public exchangeAddress!: string;
+    @PrimaryColumn() public orderHashHex!: string;
 
-    @Column({ name: 'maker_address' })
-    public makerAddress!: string;
-    @Column({ name: 'taker_address' })
-    public takerAddress!: string;
-    @Column({ name: 'fee_recipient_address' })
-    public feeRecipientAddress!: string;
-    @Column({ name: 'sender_address' })
-    public senderAddress!: string;
-    @Column({ name: 'maker_asset_amount', type: 'numeric', transformer: bigNumberTransformer })
-    public makerAssetAmount!: BigNumber;
-    @Column({ name: 'taker_asset_amount', type: 'numeric', transformer: bigNumberTransformer })
-    public takerAssetAmount!: BigNumber;
-    @Column({ name: 'maker_fee', type: 'numeric', transformer: bigNumberTransformer })
-    public makerFee!: BigNumber;
-    @Column({ name: 'taker_fee', type: 'numeric', transformer: bigNumberTransformer })
-    public takerFee!: BigNumber;
-    @Column({ name: 'expiration_time_seconds', type: 'numeric', transformer: bigNumberTransformer })
-    public expirationTimeSeconds!: BigNumber;
-    @Column({ name: 'salt', type: 'numeric', transformer: bigNumberTransformer })
-    public salt!: BigNumber;
-    @Column({ name: 'signature' })
-    public signature!: string;
+    @Column() public sourceUrl!: string;
+    @Column() public lastUpdatedTimestamp!: number;
+    @Column() public firstSeenTimestamp!: number;
 
-    @Column({ name: 'raw_maker_asset_data' })
-    public rawMakerAssetData!: string;
-    @Column({ name: 'maker_asset_type' })
-    public makerAssetType!: AssetType;
-    @Column({ name: 'maker_asset_proxy_id' })
-    public makerAssetProxyId!: string;
-    @Column({ name: 'maker_token_address' })
-    public makerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'maker_token_id' })
+    @Column() public makerAddress!: string;
+    @Column() public takerAddress!: string;
+    @Column() public feeRecipientAddress!: string;
+    @Column() public senderAddress!: string;
+    @Column() public makerAssetAmount!: string;
+    @Column() public takerAssetAmount!: string;
+    @Column() public makerFee!: string;
+    @Column() public takerFee!: string;
+    @Column() public expirationTimeSeconds!: string;
+    @Column() public salt!: string;
+    @Column() public signature!: string;
+
+    @Column() public rawMakerAssetData!: string;
+    @Column() public makerAssetType!: AssetType;
+    @Column() public makerAssetProxyId!: string;
+    @Column() public makerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public makerTokenId!: string | null;
-    @Column({ name: 'raw_taker_asset_data' })
-    public rawTakerAssetData!: string;
-    @Column({ name: 'taker_asset_type' })
-    public takerAssetType!: AssetType;
-    @Column({ name: 'taker_asset_proxy_id' })
-    public takerAssetProxyId!: string;
-    @Column({ name: 'taker_token_address' })
-    public takerTokenAddress!: string;
-    @Column({ nullable: true, type: String, name: 'taker_token_id' })
+    @Column() public rawTakerAssetData!: string;
+    @Column() public takerAssetType!: AssetType;
+    @Column() public takerAssetProxyId!: string;
+    @Column() public takerTokenAddress!: string;
+    @Column({ nullable: true, type: String })
     public takerTokenId!: string | null;
 
     // TODO(albrow): Make this optional?
-    @Column({ name: 'metadata_json' })
-    public metadataJson!: string;
+    @Column() public metaDataJson!: string;
 }