From 54cb529ff3a712c942452897cc415e5e1d5ef988 Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 29 Sep 2020 21:58:39 +0200
Subject: [PATCH] typing updates, small refactor

---
 src/balancer/OceanPool.ts         | 41 +++++++++++++------------------
 src/exchange/FixedRateExchange.ts |  4 +--
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/balancer/OceanPool.ts b/src/balancer/OceanPool.ts
index 9042f43f..8d013747 100644
--- a/src/balancer/OceanPool.ts
+++ b/src/balancer/OceanPool.ts
@@ -2,7 +2,7 @@ import Web3 from 'web3'
 import { AbiItem } from 'web3-utils/types'
 import { TransactionReceipt } from 'web3-core'
 import { Pool } from './Pool'
-import { EventData } from 'web3-eth-contract'
+import { EventData, Filter } from 'web3-eth-contract'
 
 export interface PoolDetails {
   poolAddress: string
@@ -395,22 +395,18 @@ export class OceanPool extends Pool {
   /**
    * Search all pools created by an address
    * @param {String} account If empty, will return all pools ever created by anybody
-   * @return {String[]}
+   * @return {PoolDetails[]}
    */
   public async getPoolsbyCreator(account?: string): Promise<PoolDetails[]> {
     const result: PoolDetails[] = []
     const factory = new this.web3.eth.Contract(this.factoryABI, this.factoryAddress)
-    let myFilter
-    if (account) {
-      myFilter = { registeredBy: account }
-    } else {
-      myFilter = {}
-    }
+
     const events = await factory.getPastEvents('BPoolRegistered', {
-      filter: myFilter,
+      filter: account ? { registeredBy: account } : {},
       fromBlock: 0,
       toBlock: 'latest'
     })
+
     for (let i = 0; i < events.length; i++) {
       if (account) {
         if (events[i].returnValues[1] === account) {
@@ -420,16 +416,15 @@ export class OceanPool extends Pool {
     }
     return result
   }
+
   /**
    * Get pool details
    * @param {String} poolAddress Pool address
-   * @return {PoolDetails[]}
+   * @return {PoolDetails}
    */
-
   public async getPoolDetails(poolAddress: string): Promise<PoolDetails> {
-    const details: PoolDetails = { poolAddress: null, tokens: null }
-    details.poolAddress = poolAddress
-    details.tokens = await super.getFinalTokens(poolAddress)
+    const tokens = await super.getFinalTokens(poolAddress)
+    const details: PoolDetails = { poolAddress, tokens }
     return details
   }
 
@@ -440,7 +435,7 @@ export class OceanPool extends Pool {
    * @param {Boolean} swaps Include swaps
    * @param {Boolean} joins Include joins
    * @param {Boolean} exits Include exits
-   * @return {PoolLogs[]}
+   * @return {PoolLogs}
    */
   public async getPoolLogs(
     poolAddress: string,
@@ -450,15 +445,9 @@ export class OceanPool extends Pool {
     exits?: boolean
   ): Promise<PoolLogs> {
     const results: PoolLogs = { joins: [], exits: [], swaps: [] }
-    const pool = new this.web3.eth.Contract(this.poolABI, poolAddress, {
-      from: account
-    })
-
+    const pool = new this.web3.eth.Contract(this.poolABI, poolAddress, { from: account })
+    const myFilter: Filter = account ? { caller: account } : {}
     let events: EventData[]
-    let myFilter
-
-    if (account) myFilter = { caller: account }
-    else myFilter = {}
 
     if (swaps) {
       events = await pool.getPastEvents('LOG_SWAP', {
@@ -555,7 +544,11 @@ export class OceanPool extends Pool {
     return results
   }
 
-  private getEventData(action: string, poolAddress: string, data: EventData): PoolAction {
+  private getEventData(
+    action: 'swap' | 'join' | 'exit',
+    poolAddress: string,
+    data: EventData
+  ): PoolAction {
     let result: PoolAction = {
       poolAddress,
       caller: data.returnValues[0],
diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts
index 7910875a..35add8f6 100644
--- a/src/exchange/FixedRateExchange.ts
+++ b/src/exchange/FixedRateExchange.ts
@@ -404,8 +404,8 @@ export class OceanFixedRateExchange {
     for (let i = 0; i < events.length; i++) {
       if (account) {
         if (events[i].returnValues[1] === account)
-          result.push(await this.getEventData(events[i]))
-      } else result.push(await this.getEventData(events[i]))
+          result.push(this.getEventData(events[i]))
+      } else result.push(this.getEventData(events[i]))
     }
     return result
   }