Skip to content

Commit

Permalink
chore(apps/whale-api): rename whale to whale-api (#1465)
Browse files Browse the repository at this point in the history
Allows us to follow jellyfish/apps standard and avoid ghcr name conflict with existing whale package
  • Loading branch information
eli-lim authored May 23, 2022
1 parent 8ab775c commit bee44d9
Show file tree
Hide file tree
Showing 177 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/apps/playground-api/ @fuxingloh @canonbrother
/packages/playground-api-client/ @fuxingloh @canonbrother

/apps/whale/ @fuxingloh @canonbrother @ivan-zynesis @jingyi2811 @kodemon
/apps/whale-api/ @fuxingloh @canonbrother @ivan-zynesis @jingyi2811 @kodemon
/packages/whale-api-client/ @fuxingloh @canonbrother @ivan-zynesis @jingyi2811 @kodemon
/packages/whale-api-wallet/ @fuxingloh @canonbrother @ivan-zynesis @jingyi2811 @kodemon

Expand Down
8 changes: 4 additions & 4 deletions apps/nest-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"entryFile": "apps/status-api/src/index",
"sourceRoot": "status-api/src"
},
"whale": {
"whale-api": {
"type": "application",
"root": "whale",
"entryFile": "apps/whale/src/index",
"sourceRoot": "whale/src"
"root": "whale-api",
"entryFile": "apps/whale-api/src/index",
"sourceRoot": "whale-api/src"
},
"actuator": {
"type": "library",
Expand Down
2 changes: 1 addition & 1 deletion apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"start:playground-api": "nest start playground-api",
"start:rich-list-api": "nest start rich-list-api",
"start:status-api": "nest start status-api",
"start:whale": "nest start whale",
"start:whale-api": "nest start whale-api",
"clean": "rm -rf dist"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/status-api/src/controllers/OracleStatusController.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Controller, Get, Param } from '@nestjs/common'
import { WhaleApiClient } from '@defichain/whale-api-client'
import { Oracle } from '@defichain/whale-api-client/dist/api/Oracles'
import { SemaphoreCache } from '../../../whale/src/module.api/cache/semaphore.cache'
import { SemaphoreCache } from '../../../whale-api/src/module.api/cache/semaphore.cache'

type OracleStatus = 'outage' | 'operational'

Expand Down
2 changes: 1 addition & 1 deletion apps/status-api/src/modules/ControllerModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActuatorController } from '@defichain-apps/libs/actuator'
import { BlockchainStatusController } from '../controllers/BlockchainStatusController'
import { WhaleApiClient } from '@defichain/whale-api-client'
import { ConfigService } from '@nestjs/config'
import { SemaphoreCache } from '../../../whale/src/module.api/cache/semaphore.cache'
import { SemaphoreCache } from '../../../whale-api/src/module.api/cache/semaphore.cache'
import { OracleStatusController } from '../controllers/OracleStatusController'
import { OverallStatusController } from '../controllers/OverallStatusController'

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion jest.sanity.setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const Dockerode = require('dockerode')
const path = require('path')
const { pack } = require('tar-fs')

const apps = ['whale']
const apps = ['whale-api']

module.exports = async function () {
console.log('\nPreloading sanity images, this may take a while...')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { waitForCondition } from '../../utils'

export class WhaleSanityContainer extends AppContainer {
constructor (port?: number, blockchain?: MasterNodeRegTestContainer) {
super('whale', port, blockchain)
super('whale-api', port, blockchain)
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TestingGroup, Testing } from '@defichain/jellyfish-testing'
import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
import { RegTestFoundationKeys } from '@defichain/jellyfish-network'
import { VaultLiquidation } from '@defichain/jellyfish-api-core/dist/category/loan'
import { HexEncoder } from '@defichain-apps/nest-apps/whale/src/module.model/_hex.encoder'
import { HexEncoder } from '@defichain-apps/nest-apps/whale-api/src/module.model/_hex.encoder'

const tGroup = TestingGroup.create(2, i => new MasterNodeRegTestContainer(RegTestFoundationKeys[i]))
const alice = tGroup.get(0)
Expand Down
2 changes: 1 addition & 1 deletion packages/whale-api-client/__tests__/api/prices.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { PriceFeedTimeInterval } from '@defichain/whale-api-client/dist/api/Pric
import { Testing } from '@defichain/jellyfish-testing'
import {
OracleIntervalSeconds
} from '@defichain-apps/nest-apps/whale/src/module.model/oracle.price.aggregated.interval'
} from '@defichain-apps/nest-apps/whale-api/src/module.model/oracle.price.aggregated.interval'

describe('oracles', () => {
let container: MasterNodeRegTestContainer
Expand Down
8 changes: 4 additions & 4 deletions packages/whale-api-client/__tests__/stub.service.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
import { NestFastifyApplication } from '@nestjs/platform-fastify'
import { createTestingApp } from '@defichain-apps/nest-apps/whale/src/e2e.module'
import { addressToHid } from '@defichain-apps/nest-apps/whale/src/module.api/address.controller'
import { createTestingApp } from '@defichain-apps/nest-apps/whale-api/src/e2e.module'
import { addressToHid } from '@defichain-apps/nest-apps/whale-api/src/module.api/address.controller'
import waitForExpect from 'wait-for-expect'
import { ScriptAggregationMapper } from '@defichain-apps/nest-apps/whale/src/module.model/script.aggregation'
import { BlockMapper } from '@defichain-apps/nest-apps/whale/src/module.model/block'
import { ScriptAggregationMapper } from '@defichain-apps/nest-apps/whale-api/src/module.model/script.aggregation'
import { BlockMapper } from '@defichain-apps/nest-apps/whale-api/src/module.model/block'

/**
* Service stubs are simulations of a real service, which are used for functional testing.
Expand Down

0 comments on commit bee44d9

Please sign in to comment.