From dc3722c6a17d8d14d6ffaf55cc6c1f3fdf134bbc Mon Sep 17 00:00:00 2001
From: canonbrother <w.canonbrother@gmail.com>
Date: Wed, 31 Jan 2024 15:02:30 +0800
Subject: [PATCH] e2e -> defid

---
 .../address.controller.defid.ts}                              | 0
 .../block.controller.defid.ts}                                | 0
 .../fee.controller.defid.ts}                                  | 0
 .../governance.controller.defid.ts}                           | 0
 .../loan.auction.controller.defid.ts}                         | 0
 .../loan.auction.history.defid.ts}                            | 0
 .../loan.collateral.controller.defid.ts}                      | 0
 .../loan.scheme.controller.defid.ts}                          | 0
 .../loan.token.controller.defid.ts}                           | 0
 .../loan.vault.controller.defid.ts}                           | 0
 .../masternode.controller.defid.ts}                           | 0
 .../poolpair.controller.defid.ts}                             | 0
 .../poolpair.fees.service.defid.ts}                           | 0
 .../rawtx.controller.defid.ts}                                | 0
 .../stats.controller.defid.ts}                                | 0
 .../token.controller.defid.ts}                                | 0
 .../transaction.controller.defid.ts}                          | 4 ++--
 17 files changed, 2 insertions(+), 2 deletions(-)
 rename apps/whale-api/src/module.api/{defid-e2e/address.controller.e2e.ts => __defid__/address.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/block.controller.e2e.ts => __defid__/block.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/fee.controller.e2e.ts => __defid__/fee.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/governance.controller.e2e.ts => __defid__/governance.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.auction.controller.e2e.ts => __defid__/loan.auction.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.auction.history.e2e.ts => __defid__/loan.auction.history.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.collateral.controller.e2e.ts => __defid__/loan.collateral.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.scheme.controller.e2e.ts => __defid__/loan.scheme.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.token.controller.e2e.ts => __defid__/loan.token.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/loan.vault.controller.e2e.ts => __defid__/loan.vault.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/masternode.controller.e2e.ts => __defid__/masternode.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/poolpair.controller.e2e.ts => __defid__/poolpair.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/poolpair.fees.service.e2e.ts => __defid__/poolpair.fees.service.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/rawtx.controller.e2e.ts => __defid__/rawtx.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/stats.controller.e2e.ts => __defid__/stats.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/token.controller.e2e.ts => __defid__/token.controller.defid.ts} (100%)
 rename apps/whale-api/src/module.api/{defid-e2e/transaction.controller.e2e.ts => __defid__/transaction.controller.defid.ts} (98%)

diff --git a/apps/whale-api/src/module.api/defid-e2e/address.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/address.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/address.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/address.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/block.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/block.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/block.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/block.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/fee.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/fee.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/fee.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/fee.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/governance.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/governance.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/governance.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/governance.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.auction.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.auction.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.auction.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.auction.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.auction.history.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.auction.history.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.auction.history.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.auction.history.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.collateral.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.collateral.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.collateral.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.collateral.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.scheme.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.scheme.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.scheme.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.scheme.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.token.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.token.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.token.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.token.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.vault.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.vault.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.vault.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.vault.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/masternode.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/masternode.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/masternode.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/masternode.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/poolpair.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/poolpair.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/poolpair.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/poolpair.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/poolpair.fees.service.e2e.ts b/apps/whale-api/src/module.api/__defid__/poolpair.fees.service.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/poolpair.fees.service.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/poolpair.fees.service.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/rawtx.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/rawtx.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/rawtx.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/rawtx.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/stats.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/stats.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/stats.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/stats.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/token.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/token.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/token.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/token.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
similarity index 98%
rename from apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
index a33ddfcaac..7c784c22a0 100644
--- a/apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts
+++ b/apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
@@ -15,7 +15,7 @@ beforeAll(async () => {
   await app.waitForWalletCoinbaseMaturity()
   await app.waitForWalletBalanceGTE(100)
 
-  client = new JsonRpcClient(app.url)
+  client = new JsonRpcClient(app.rpcUrl)
 
   await app.waitForIndexedHeight(100)
 })
@@ -81,7 +81,7 @@ describe('get', () => {
     expect.assertions(2)
     try {
       await controller.get('invalidtransactionid')
-    } catch (err) {
+    } catch (err: any) {
       expect(err).toBeInstanceOf(NotFoundException)
       expect(err.response).toStrictEqual({
         statusCode: 404,