From 63e01ee85813de3de70a04c5bc59cd64e42e5091 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 29 Sep 2020 21:48:48 +0200
Subject: [PATCH] getEventData refactor

---
 src/balancer/OceanPool.ts         | 40 +++++++++++++++++++------------
 src/exchange/FixedRateExchange.ts | 16 +++++--------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/balancer/OceanPool.ts b/src/balancer/OceanPool.ts
index afdd9d1b..9042f43f 100644
--- a/src/balancer/OceanPool.ts
+++ b/src/balancer/OceanPool.ts
@@ -555,27 +555,37 @@ export class OceanPool extends Pool {
     return results
   }
 
-  private getEventData(action: string, poolAddress: string, data: any): PoolAction {
-    const result = Object()
-    result.action = action
-    result.poolAddress = poolAddress
-    result.caller = data.returnValues[0]
-    result.transactionHash = data.transactionHash
-    result.blockNumber = data.blockNumber
+  private getEventData(action: string, poolAddress: string, data: EventData): PoolAction {
+    let result: PoolAction = {
+      poolAddress,
+      caller: data.returnValues[0],
+      transactionHash: data.transactionHash,
+      blockNumber: data.blockNumber
+    }
+
     switch (action) {
       case 'swap':
-        result.tokenIn = data.returnValues[1]
-        result.tokenOut = data.returnValues[2]
-        result.tokenAmountIn = data.returnValues[3]
-        result.tokenAmountOut = data.returnValues[4]
+        result = {
+          ...result,
+          tokenIn: data.returnValues[1],
+          tokenOut: data.returnValues[2],
+          tokenAmountIn: data.returnValues[3],
+          tokenAmountOut: data.returnValues[4]
+        }
         break
       case 'join':
-        result.tokenIn = data.returnValues[1]
-        result.tokenAmountIn = data.returnValues[2]
+        result = {
+          ...result,
+          tokenIn: data.returnValues[1],
+          tokenAmountIn: data.returnValues[2]
+        }
         break
       case 'exit':
-        result.tokenOut = data.returnValues[1]
-        result.tokenAmountOut = data.returnValues[2]
+        result = {
+          ...result,
+          tokenOut: data.returnValues[1],
+          tokenAmountOut: data.returnValues[2]
+        }
         break
     }
     return result
diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts
index 99a41f91..7910875a 100644
--- a/src/exchange/FixedRateExchange.ts
+++ b/src/exchange/FixedRateExchange.ts
@@ -1,7 +1,7 @@
 import defaultFixedRateExchangeABI from '@oceanprotocol/contracts/artifacts/FixedRateExchange.json'
 import BigNumber from 'bignumber.js'
 import { TransactionReceipt } from 'web3-core'
-import { Contract } from 'web3-eth-contract'
+import { Contract, EventData } from 'web3-eth-contract'
 import { AbiItem } from 'web3-utils/types'
 import Web3 from 'web3'
 
@@ -434,17 +434,13 @@ export class OceanFixedRateExchange {
     return result
   }
 
-  private getEventData(data: any): FixedPricedSwap {
+  private getEventData(data: EventData): FixedPricedSwap {
     const result: FixedPricedSwap = {
-      exchangeID: null,
-      caller: null,
-      baseTokenAmount: null,
-      dataTokenAmount: null
+      exchangeID: data.returnValues[0],
+      caller: data.returnValues[1],
+      baseTokenAmount: data.returnValues[2],
+      dataTokenAmount: data.returnValues[3]
     }
-    result.exchangeID = data.returnValues[0]
-    result.caller = data.returnValues[1]
-    result.baseTokenAmount = data.returnValues[2]
-    result.dataTokenAmount = data.returnValues[3]
     return result
   }
 }