chore(): support whale test suite for defid ocean

apps/whale-api/src/e2e.module.ts

@@ -10,6 +10,7 @@
 import { addressToHid } from './module.api/address.controller'
 import { ScriptAggregationMapper } from './module.model/script.aggregation'
 import { TestingGroup } from '@defichain/jellyfish-testing'
+import { DefidBin } from './e2e.defid.module'
 
 /**
  * Configures an end-to-end testing app integrated with all modules.
@@ -46,7 +47,7 @@
   } finally {
     await new Promise((resolve) => {
       // Wait 2000ms between indexer cycle time to prevent database error
-      setTimeout(_ => resolve(0), 500)
+      setTimeout((_: any) => resolve(0), 500)
     })
 
     if (container instanceof MasterNodeRegTestContainer) {
@@ -82,12 +83,20 @@
  * @param {number} height to wait for
  * @param {number} [timeout=30000]
  */
-export async function waitForIndexedHeight (app: NestFastifyApplication, height: number, timeout: number = 30000): Promise<void> {
-  const blockMapper = app.get(BlockMapper)
-  await waitForExpect(async () => {
-    const block = await blockMapper.getHighest()
-    await expect(block?.height).toBeGreaterThan(height)
-  }, timeout)
+export async function waitForIndexedHeight (app: NestFastifyApplication | DefidBin, height: number, timeout: number = 30000): Promise<void> {
+  if (app instanceof DefidBin) {
+    await waitForExpect(async () => {
+      const block = await app.ocean.blockController.getHighest()
+      expect(block?.height).toBeGreaterThan(height)
+      await app.rpc.generate(1)
+    }, timeout)
+  } else {
+    const blockMapper = app.get(BlockMapper)
+    await waitForExpect(async () => {
+      const block = await blockMapper.getHighest()
+      expect(block?.height).toBeGreaterThan(height)
+    }, timeout)
+  }
   await new Promise((resolve) => setTimeout(resolve, 1000))
 }
 
@@ -105,7 +114,11 @@
   }, timeout)
 }
 
-export async function waitForAddressTxCount (app: NestFastifyApplication, address: string, txCount: number, timeout: number = 15000): Promise<void> {
+// TODO(): handle DefidBin
+export async function waitForAddressTxCount (app: NestFastifyApplication | DefidBin, address: string, txCount: number, timeout: number = 15000): Promise<void> {
+  if (app instanceof DefidBin) {
+    return
+  }
   const hid = addressToHid('regtest', address)
   const aggregationMapper = app.get(ScriptAggregationMapper)
   await waitForExpect(async () => {

apps/whale-api/src/module.api/address.controller.e2e.ts

@@ -8,10 +8,11 @@ import { Testing } from '@defichain/jellyfish-testing'
 import { ForbiddenException } from '@nestjs/common'
 import BigNumber from 'bignumber.js'
 import { RegTestFoundationKeys } from '@defichain/jellyfish-network'
+import { DAddressController, DefidBin } from '../e2e.defid.module'
 
 const container = new MasterNodeRegTestContainer()
-let app: NestFastifyApplication
-let controller: AddressController
+let app: NestFastifyApplication | DefidBin
+let controller: AddressController | DAddressController
 const testing = Testing.create(container)
 let colAddr: string
 let usdcAddr: string
@@ -149,7 +150,11 @@ describe('listAccountHistory', () => {
     await testing.generate(1)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await testing.generate(1)
 
@@ -398,7 +403,11 @@ describe('getAccount', () => {
     await testing.generate(1)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await testing.generate(1)
   })
@@ -474,7 +483,11 @@ describe('getBalance', () => {
     await container.waitForWalletBalanceGTE(100)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await waitForIndexedHeight(app, 100)
   })
@@ -543,7 +556,11 @@ describe('getAggregation', () => {
     await container.waitForWalletBalanceGTE(100)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await waitForIndexedHeight(app, 100)
   })
@@ -599,7 +616,11 @@ describe('listTransactions', () => {
     await container.waitForWalletBalanceGTE(100)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await waitForIndexedHeight(app, 100)
 
@@ -759,7 +780,11 @@ describe('listTransactionsUnspent', () => {
     await container.waitForWalletBalanceGTE(100)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await waitForIndexedHeight(app, 100)
 
@@ -988,7 +1013,11 @@ describe('listTokens', () => {
     await container.waitForWalletBalanceGTE(100)
 
     app = await createTestingApp(container)
-    controller = app.get(AddressController)
+    if (app instanceof DefidBin) {
+      controller = app.addressController
+    } else {
+      controller = app.get(AddressController)
+    }
 
     await waitForIndexedHeight(app, 100)
 

apps/whale-api/src/module.api/block.controller.e2e.ts

@@ -3,21 +3,33 @@ import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { NestFastifyApplication } from '@nestjs/platform-fastify'
 import { createTestingApp, stopTestingApp, waitForIndexedHeight } from '../e2e.module'
 import { JsonRpcClient } from '@defichain/jellyfish-api-jsonrpc'
+import { DBlockController, DefidBin, DefidRpc } from '../e2e.defid.module'
 
-const container = new MasterNodeRegTestContainer()
-let app: NestFastifyApplication
-let controller: BlockController
+let app: NestFastifyApplication | DefidBin
+let container: MasterNodeRegTestContainer | DefidRpc
+let controller: BlockController | DBlockController
 let client: JsonRpcClient
 
 beforeAll(async () => {
-  await container.start()
-  await container.waitForBlockHeight(101)
-
-  app = await createTestingApp(container)
-
-  await waitForIndexedHeight(app, 100)
-  controller = app.get(BlockController)
-  client = new JsonRpcClient(await container.getCachedRpcUrl())
+  if (process.env.DEFID !== undefined) {
+    app = new DefidBin()
+    await app.start()
+    container = app.rpc
+    controller = app.ocean.blockController
+    await container.waitForBlockHeight(101)
+    // await waitForIndexedHeight(app, 100)
+    client = new JsonRpcClient(container.getCachedRpcUrl())
+  } else {
+    container = new MasterNodeRegTestContainer()
+    await container.start()
+    await container.waitForBlockHeight(101)
+
+    app = await createTestingApp(container)
+
+    await waitForIndexedHeight(app, 100)
+    controller = app.get(BlockController)
+    client = new JsonRpcClient(await container.getCachedRpcUrl())
+  }
 
   const address = await container.getNewAddress()
   for (let i = 0; i < 4; i += 1) {
@@ -29,7 +41,11 @@ beforeAll(async () => {
 })
 
 afterAll(async () => {
-  await stopTestingApp(container, app)
+  if (process.env.DEFID !== undefined) {
+    await (app as DefidBin).stop()
+    return
+  }
+  await stopTestingApp(container as MasterNodeRegTestContainer, app as NestFastifyApplication)
 })
 
 describe('get', () => {

apps/whale-api/src/module.api/fee.controller.e2e.ts

@@ -3,24 +3,39 @@ import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { NestFastifyApplication } from '@nestjs/platform-fastify'
 import { createTestingApp, stopTestingApp } from '../e2e.module'
 import { FeeController } from './fee.controller'
+import { DefidBin, DefidRpc, DFeeController } from '../e2e.defid.module'
 
-const container = new MasterNodeRegTestContainer()
-let app: NestFastifyApplication
-let controller: FeeController
+let container: MasterNodeRegTestContainer | DefidRpc
+let app: NestFastifyApplication | DefidBin
+let controller: FeeController | DFeeController
 let client: JsonRpcClient
 
 beforeAll(async () => {
-  await container.start()
-  await container.waitForWalletCoinbaseMaturity()
-  await container.waitForWalletBalanceGTE(100)
+  if (process.env.DEFID !== undefined) {
+    app = new DefidBin()
+    await app.start()
+    container = app.rpc
+    controller = app.ocean.feeController
+    await container.waitForWalletCoinbaseMaturity()
+    await container.waitForWalletBalanceGTE(100)
+  } else {
+    container = new MasterNodeRegTestContainer()
+    await container.start()
+    await container.waitForWalletCoinbaseMaturity()
+    await container.waitForWalletBalanceGTE(100)
+    app = await createTestingApp(container)
+    controller = app.get<FeeController>(FeeController)
+  }
 
-  app = await createTestingApp(container)
-  controller = app.get<FeeController>(FeeController)
   client = new JsonRpcClient(await container.getCachedRpcUrl())
 })
 
 afterAll(async () => {
-  await stopTestingApp(container, app)
+  if (process.env.DEFID !== undefined) {
+    await (app as DefidBin).stop()
+    return
+  }
+  await stopTestingApp(container as MasterNodeRegTestContainer, app as NestFastifyApplication)
 })
 
 describe('fee/estimate', () => {

apps/whale-api/src/module.api/governance.controller.e2e.ts

@@ -11,6 +11,7 @@ import { NestFastifyApplication } from '@nestjs/platform-fastify'
 import BigNumber from 'bignumber.js'
 import { createTestingApp, stopTestingApp } from '../e2e.module'
 import { GovernanceController } from './governance.controller'
+import { DefidBin, DGovernanceController } from '../e2e.defid.module'
 
 class MultiOperatorGovernanceMasterNodeRegTestContainer extends MasterNodeRegTestContainer {
   protected getCmd (opts: StartOptions): string[] {
@@ -22,8 +23,8 @@ class MultiOperatorGovernanceMasterNodeRegTestContainer extends MasterNodeRegTes
   }
 }
 const container = new MultiOperatorGovernanceMasterNodeRegTestContainer()
-let app: NestFastifyApplication
-let controller: GovernanceController
+let app: NestFastifyApplication | DefidBin
+let controller: GovernanceController | DGovernanceController
 const testing = Testing.create(container)
 let cfpProposalId: string
 let vocProposalId: string
@@ -39,7 +40,11 @@ describe('governance - listProposals and getProposal', () => {
     ])
     await testing.container.generate(1)
     app = await createTestingApp(container)
-    controller = app.get(GovernanceController)
+    if (app instanceof DefidBin) {
+      controller = app.governanceController
+    } else {
+      controller = app.get(GovernanceController)
+    }
 
     // Create 1 CFP + 1 VOC
     payoutAddress = await testing.generateAddress()
@@ -259,7 +264,11 @@ describe('governance - listProposalVotes', () => {
     ])
     await testing.container.generate(1)
     app = await createTestingApp(container)
-    controller = app.get(GovernanceController)
+    if (app instanceof DefidBin) {
+      controller = app.governanceController
+    } else {
+      controller = app.get(GovernanceController)
+    }
 
     /**
      * Import the private keys of the masternode_operator in order to be able to mint blocks and vote on proposals.