refactoring

src/keeper/Auth.ts

@@ -2,9 +2,9 @@ import {Receipt} from "web3-utils"
 import AccessStatus from "../models/AccessStatus"
 import Asset from "../ocean/Asset"
 import Order from "../ocean/Order"
-import ContractBaseWrapper from "./ContractWrapperBase"
+import ContractBase from "./ContractBase"
 
-export default class OceanAuth extends ContractBaseWrapper {
+export default class OceanAuth extends ContractBase {
 
     public static async getInstance(): Promise<OceanAuth> {
         const auth: OceanAuth = new OceanAuth("OceanAuth")

src/keeper/ContractBase.ts

@@ -3,7 +3,7 @@ import Contract from "web3-eth-contract"
 import Logger from "../utils/Logger"
 import ContractHandler from "./ContractHandler"
 
-export default abstract class ContractWrapperBase {
+export default abstract class ContractBase {
 
     protected static instance = null
 
@@ -14,6 +14,7 @@ export default abstract class ContractWrapperBase {
         this.contractName = contractName
     }
 
+    /*
     public async listenToEventOnce(eventName: string, options: any): Promise<any> {
         return new Promise<any>((resolve, reject) => {
             if (!this.contract.events[eventName]) {
@@ -27,6 +28,7 @@ export default abstract class ContractWrapperBase {
                 })
         })
     }
+    */
 
     public async getEventData(eventName: any, options: any): Promise<Event[]> {
         if (!this.contract.events[eventName]) {

src/keeper/Market.ts

@@ -1,9 +1,9 @@
 import BigNumber from "bignumber.js"
 import {Receipt} from "web3-utils"
 import Order from "../ocean/Order"
-import ContractWrapperBase from "./ContractWrapperBase"
+import ContractBase from "./ContractBase"
 
-export default class OceanMarket extends ContractWrapperBase {
+export default class OceanMarket extends ContractBase {
 
     public static async getInstance(): Promise<OceanMarket> {
         const market: OceanMarket = new OceanMarket("OceanMarket")

src/keeper/Token.ts

@@ -1,8 +1,8 @@
 import BigNumber from "bignumber.js"
 import {Receipt} from "web3-utils"
-import ContractBaseWrapper from "./ContractWrapperBase"
+import ContractBase from "./ContractBase"
 
-export default class OceanToken extends ContractBaseWrapper {
+export default class OceanToken extends ContractBase {
 
     public static async getInstance(): Promise<OceanToken> {
         const token: OceanToken = new OceanToken("OceanToken")

test/keeper/ContractBase.test.ts

@@ -1,9 +1,9 @@
 import ConfigProvider from "../../src/ConfigProvider"
 import ContractHandler from "../../src/keeper/ContractHandler"
 import config from "../config"
-import ContractWrapperBaseMock from "../mocks/ContractWrapperBase.Mock"
+import ContractBaseMock from "../mocks/ContractBase.Mock"
 
-const wrappedContract = new ContractWrapperBaseMock("OceanToken")
+const wrappedContract = new ContractBaseMock("OceanToken")
 
 before(async () => {
     ConfigProvider.configure(config)

test/mocks/ContractBase.Mock.ts

@@ -1,6 +1,6 @@
-import ContractWrapperBase from "../../src/keeper/ContractWrapperBase"
+import ContractBase from "../../src/keeper/ContractBase"
 
-export default class ContractWrapperBaseMock extends ContractWrapperBase {
+export default class ContractBaseMock extends ContractBase {
     public async initMock() {
         this.init()
     }