chore(watcher-service): fix code review comments

rosen-bridge · Dec 30, 2023 · 35fc979 · 35fc979
1 parent 2a07346
commit 35fc979
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/services/watcher/tests/api/revenues.ts b/services/watcher/tests/api/revenues.ts
@@ -47,8 +47,6 @@ describe('revenueRouter', () => {
       // send a request to the endpoint
       const res = await request(app).get('/revenue');
 
-      console.warn(res);
-
       // check the result
       expect(res.status).to.eql(200);
       const resultParsed = JSON.parse(res.text);
@@ -100,9 +98,9 @@ describe('revenueRouter', () => {
       // check the result
       expect(res.status).to.eql(200);
       const resultParsed = JSON.parse(res.text);
-      expect(resultParsed.total).to.eql(4);
+      expect(resultParsed.total).to.eql(3);
       const revenueIds = resultParsed.items.map((revenue: any) => revenue.id);
-      expect(revenueIds).to.eql([4, 3]);
+      expect(revenueIds).to.eql([3]);
     });
 
     /**

diff --git a/services/watcher/tests/api/testDataEvents.ts b/services/watcher/tests/api/testDataEvents.ts
@@ -110,7 +110,7 @@ const events = [
     boxSerialized: 'box2',
     block: 'blockID2',
     height: 100,
-    fromChain: 'ergo',
+    fromChain: 'cardano',
     toChain: 'toChain',
     fromAddress: 'fromAddress',
     toAddress: 'toAddressStar',
@@ -144,7 +144,7 @@ const events = [
     boxSerialized: 'box',
     block: 'blockID',
     height: 100,
-    fromChain: 'ergo',
+    fromChain: 'cardano',
     toChain: 'toChain',
     fromAddress: 'fromAddressStar',
     toAddress: 'toAddress',

diff --git a/services/watcher/tests/database/mockedData.ts b/services/watcher/tests/database/mockedData.ts
@@ -188,7 +188,7 @@ eventTriggerEntity.networkFee = '1000';
 eventTriggerEntity.bridgeFee = '200';
 eventTriggerEntity.fromAddress = 'fromAddressStar';
 eventTriggerEntity.toAddress = 'toAddress';
-eventTriggerEntity.fromChain = 'ergo';
+eventTriggerEntity.fromChain = 'cardano';
 eventTriggerEntity.toChain = 'toChain';
 eventTriggerEntity.sourceChainTokenId = 'tokenId2';
 eventTriggerEntity.targetChainTokenId = 'targetTokenId';
@@ -211,7 +211,7 @@ newEventTriggerEntity.networkFee = '1000';
 newEventTriggerEntity.bridgeFee = '200';
 newEventTriggerEntity.fromAddress = 'fromAddress';
 newEventTriggerEntity.toAddress = 'toAddressStar';
-newEventTriggerEntity.fromChain = 'ergo';
+newEventTriggerEntity.fromChain = 'cardano';
 newEventTriggerEntity.toChain = 'toChain';
 newEventTriggerEntity.sourceChainTokenId = 'tokenId';
 newEventTriggerEntity.targetChainTokenId = 'targetTokenId';

diff --git a/services/watcher/tests/ergo/statistics/mockUtils.ts b/services/watcher/tests/ergo/statistics/mockUtils.ts
@@ -208,17 +208,17 @@ const firstRevenue = {
   wid: 'WIDStatistics',
   eventId: 'ab59962c20f57d9d59e95f5170ccb3472df4279ad4967e51ba8be9ba75144c7b',
   lockHeight: 123457,
-  fromChain: 'ergo',
+  fromChain: 'cardano',
   toChain: 'toChain',
   fromAddress: 'fromAddress',
   toAddress: 'toAddressStar',
   amount: '100',
   bridgeFee: '200',
   networkFee: '1000',
   lockToken: {
-    decimals: 6,
+    decimals: 0,
     isNativeToken: false,
-    name: 'test token 10',
+    name: 'Unsupported token',
     tokenId: 'tokenId',
   },
   lockTxId: 'txId2',
@@ -255,9 +255,9 @@ const lastRevenue = {
   bridgeFee: '200',
   networkFee: '1000',
   lockToken: {
-    decimals: 6,
+    decimals: 0,
     isNativeToken: false,
-    name: 'test token 10',
+    name: 'Unsupported token',
     tokenId: 'tokenId',
   },
   lockTxId: 'txIdStar',
@@ -277,17 +277,17 @@ const tokenId2Revenue = {
   permitTxId: 'txId',
   eventId: 'ab59962c20f57d9d59e95f5170ccb3472df4279ad4967e51ba8be9ba75144c7b',
   lockHeight: 123457,
-  fromChain: 'ergo',
+  fromChain: 'cardano',
   toChain: 'toChain',
   fromAddress: 'fromAddressStar',
   toAddress: 'toAddress',
   amount: '100',
   bridgeFee: '200',
   networkFee: '1000',
   lockToken: {
-    decimals: 6,
+    decimals: 0,
     isNativeToken: false,
-    name: 'test token 10',
+    name: 'Unsupported token',
     tokenId: 'tokenId',
   },
   lockTxId: 'txId',
@@ -307,17 +307,17 @@ const secondTokenId2Revenue = {
   permitTxId: 'txId',
   eventId: 'ab59962c20f57d9d59e95f5170ccb3472df4279ad4967e51ba8be9ba75144c7b',
   lockHeight: 123457,
-  fromChain: 'ergo',
+  fromChain: 'cardano',
   toChain: 'toChain',
   fromAddress: 'fromAddressStar',
   toAddress: 'toAddress',
   amount: '100',
   bridgeFee: '200',
   networkFee: '1000',
   lockToken: {
-    decimals: 6,
+    decimals: 0,
     isNativeToken: false,
-    name: 'test token 10',
+    name: 'Unsupported token',
     tokenId: 'tokenId',
   },
   lockTxId: 'txId',