added a/b symbol for PoolPairData (#332)

BirthdayResearch · Aug 10, 2021 · 103ddd5 · 103ddd5
1 parent e0ce522
commit 103ddd5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/apps/whale-api/src/module.api/poolpair.controller.e2e.ts b/apps/whale-api/src/module.api/poolpair.controller.e2e.ts
@@ -95,11 +95,13 @@ describe('list', () => {
       status: true,
       tokenA: {
         id: '2',
+        symbol: 'B',
         reserve: '50',
         blockCommission: '0'
       },
       tokenB: {
         id: '0',
+        symbol: 'DFI',
         reserve: '300',
         blockCommission: '0'
       },
@@ -171,11 +173,13 @@ describe('get', () => {
       status: true,
       tokenA: {
         id: expect.any(String),
+        symbol: 'A',
         reserve: '100',
         blockCommission: '0'
       },
       tokenB: {
-        id: expect.any(String),
+        id: '0',
+        symbol: 'DFI',
         reserve: '200',
         blockCommission: '0'
       },

diff --git a/apps/whale-api/src/module.api/poolpair.controller.spec.ts b/apps/whale-api/src/module.api/poolpair.controller.spec.ts
@@ -128,11 +128,13 @@ describe('list', () => {
       status: true,
       tokenA: {
         id: '2',
+        symbol: 'B',
         reserve: '50',
         blockCommission: '0'
       },
       tokenB: {
         id: '0',
+        symbol: 'DFI',
         reserve: '300',
         blockCommission: '0'
       },
@@ -204,11 +206,13 @@ describe('get', () => {
       status: true,
       tokenA: {
         id: expect.any(String),
+        symbol: 'USDT',
         reserve: '100',
         blockCommission: '0'
       },
       tokenB: {
-        id: expect.any(String),
+        id: '0',
+        symbol: 'DFI',
         reserve: '200',
         blockCommission: '0'
       },

diff --git a/apps/whale-api/src/module.api/poolpair.controller.ts b/apps/whale-api/src/module.api/poolpair.controller.ts
@@ -63,17 +63,20 @@ export class PoolPairController {
 }
 
 function mapPoolPair (id: string, info: PoolPairInfo, totalLiquidityUsd?: BigNumber, apr?: PoolPairData['apr']): PoolPairData {
+  const [symbolA, symbolB] = info.symbol.split('-')
   return {
     id: id,
     symbol: info.symbol,
     name: info.name,
     status: info.status,
     tokenA: {
+      symbol: symbolA,
       id: info.idTokenA,
       reserve: info.reserveA.toFixed(),
       blockCommission: info.blockCommissionA.toFixed()
     },
     tokenB: {
+      symbol: symbolB,
       id: info.idTokenB,
       reserve: info.reserveB.toFixed(),
       blockCommission: info.blockCommissionB.toFixed()