From 71a015f2aa32fedd3d3c5e9d5a3fa4eb272b2852 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Tue, 25 Sep 2018 16:06:52 -0700
Subject: For event entities, rename address -> contractAddress and make it a
 primary key

---
 packages/pipeline/src/data_types/events/exchange_events.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'packages/pipeline/src/data_types/events/exchange_events.ts')

diff --git a/packages/pipeline/src/data_types/events/exchange_events.ts b/packages/pipeline/src/data_types/events/exchange_events.ts
index 763a141ea..2d4059a0e 100644
--- a/packages/pipeline/src/data_types/events/exchange_events.ts
+++ b/packages/pipeline/src/data_types/events/exchange_events.ts
@@ -60,10 +60,10 @@ export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<Exchang
     const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
     const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
     const exchangeFillEvent = new ExchangeFillEvent();
+    exchangeFillEvent.contractAddress = eventLog.address as string;
+    exchangeFillEvent.blockNumber = eventLog.blockNumber as number;
     exchangeFillEvent.logIndex = eventLog.logIndex as number;
-    exchangeFillEvent.address = eventLog.address as string;
     exchangeFillEvent.rawData = eventLog.data as string;
-    exchangeFillEvent.blockNumber = eventLog.blockNumber as number;
     exchangeFillEvent.makerAddress = eventLog.args.makerAddress.toString();
     exchangeFillEvent.takerAddress = eventLog.args.takerAddress.toString();
     exchangeFillEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
@@ -94,10 +94,10 @@ export function _convertToExchangeCancelEvent(
     const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
     const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
     const exchangeCancelEvent = new ExchangeCancelEvent();
+    exchangeCancelEvent.contractAddress = eventLog.address as string;
+    exchangeCancelEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelEvent.logIndex = eventLog.logIndex as number;
-    exchangeCancelEvent.address = eventLog.address as string;
     exchangeCancelEvent.rawData = eventLog.data as string;
-    exchangeCancelEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelEvent.makerAddress = eventLog.args.makerAddress.toString();
     exchangeCancelEvent.takerAddress =
         eventLog.args.takerAddress == null ? null : eventLog.args.takerAddress.toString();
@@ -121,10 +121,10 @@ export function _convertToExchangeCancelUpToEvent(
     eventLog: LogWithDecodedArgs<ExchangeCancelUpToEventArgs>,
 ): ExchangeCancelUpToEvent {
     const exchangeCancelUpToEvent = new ExchangeCancelUpToEvent();
+    exchangeCancelUpToEvent.contractAddress = eventLog.address as string;
+    exchangeCancelUpToEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelUpToEvent.logIndex = eventLog.logIndex as number;
-    exchangeCancelUpToEvent.address = eventLog.address as string;
     exchangeCancelUpToEvent.rawData = eventLog.data as string;
-    exchangeCancelUpToEvent.blockNumber = eventLog.blockNumber as number;
     exchangeCancelUpToEvent.makerAddress = eventLog.args.makerAddress.toString();
     exchangeCancelUpToEvent.senderAddress = eventLog.args.senderAddress.toString();
     exchangeCancelUpToEvent.orderEpoch = eventLog.args.orderEpoch.toString();
-- 
cgit v1.2.3