Add test mode in config

bosagora · Jun 13, 2024 · 1cece21 · 1cece21
1 parent a2db1e1
commit 1cece21
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/packages/relay/config/config.yaml b/packages/relay/config/config.yaml
@@ -93,6 +93,7 @@ relay:
   expoAccessToken: "${EXPO_ACCESS_TOKEN}"
   relayEndpoint: "${RELAY_ENDPOINT}"
   encryptKey: "${RELAY_ENCRYPT_KEY}"
+  testMode: false
 
 contracts:
   sideChain:

diff --git a/packages/relay/config/config_test.yaml b/packages/relay/config/config_test.yaml
@@ -93,6 +93,7 @@ relay:
   expoAccessToken: "${EXPO_ACCESS_TOKEN}"
   relayEndpoint: "${RELAY_ENDPOINT}"
   encryptKey: "${RELAY_ENCRYPT_KEY}"
+  testMode: true
 
 contracts:
   sideChain:

diff --git a/packages/relay/src/common/Config.ts b/packages/relay/src/common/Config.ts
@@ -198,6 +198,7 @@ export class RelayConfig implements IRelayConfig {
     public expoAccessToken: string;
     public relayEndpoint: string;
     public encryptKey: string;
+    public testMode: boolean;
 
     constructor() {
         const defaults = RelayConfig.defaultValue();
@@ -212,6 +213,7 @@ export class RelayConfig implements IRelayConfig {
         this.expoAccessToken = defaults.expoAccessToken;
         this.relayEndpoint = defaults.relayEndpoint;
         this.encryptKey = defaults.encryptKey;
+        this.testMode = defaults.testMode;
     }
 
     public static defaultValue(): IRelayConfig {
@@ -232,6 +234,7 @@ export class RelayConfig implements IRelayConfig {
             expoAccessToken: "",
             relayEndpoint: "",
             encryptKey: "",
+            testMode: false,
         };
     }
 
@@ -246,6 +249,7 @@ export class RelayConfig implements IRelayConfig {
         if (config.expoAccessToken !== undefined) this.expoAccessToken = config.expoAccessToken;
         if (config.relayEndpoint !== undefined) this.relayEndpoint = config.relayEndpoint;
         if (config.encryptKey !== undefined) this.encryptKey = config.encryptKey;
+        if (config.testMode !== undefined) this.testMode = Boolean(config.testMode);
     }
 }
 
@@ -467,6 +471,7 @@ export interface IRelayConfig {
     expoAccessToken: string;
     relayEndpoint: string;
     encryptKey: string;
+    testMode: boolean;
 }
 
 export interface IContractsConfig {

diff --git a/packages/relay/src/delegator/NotificationSender.ts b/packages/relay/src/delegator/NotificationSender.ts
@@ -31,7 +31,7 @@ export class NotificationSender implements INotificationSender {
             this.handler.receive(to, title, body, data);
         }
         if (!Expo.isExpoPushToken(to)) {
-            if (!process.env.TESTING) logger.error(`Push token ${to} is not a valid Expo push token`);
+            if (!this.config.relay.testMode) logger.error(`Push token ${to} is not a valid Expo push token`);
             return false;
         }
         const messages: ExpoPushMessage[] = [];

diff --git a/packages/relay/src/routers/PaymentRouter.ts b/packages/relay/src/routers/PaymentRouter.ts
@@ -340,13 +340,10 @@ export class PaymentRouter {
 
             let balance: BigNumber;
             let paidPoint: BigNumber;
-            let paidToken: BigNumber;
             let paidValue: BigNumber;
             let feePoint: BigNumber;
-            let feeToken: BigNumber;
             let feeValue: BigNumber;
             let totalPoint: BigNumber;
-            let totalToken: BigNumber;
             let totalValue: BigNumber;
 
             const contract = this.contractManager.sideLedgerContract;
@@ -357,9 +354,6 @@ export class PaymentRouter {
             if (totalPoint.gt(balance)) {
                 return res.status(200).json(ResponseMessage.getErrorMessage("1511"));
             }
-            paidToken = BigNumber.from(0);
-            feeToken = BigNumber.from(0);
-            totalToken = BigNumber.from(0);
             paidValue = BigNumber.from(amount);
             feeValue = ContractUtils.zeroGWEI(paidValue.mul(feeRate).div(10000));
             totalValue = paidValue.add(feeValue);
@@ -399,7 +393,7 @@ export class PaymentRouter {
 
             const mobileData = await this.storage.getMobile(item.account, MobileType.USER_APP);
 
-            if (!process.env.TESTING && mobileData === undefined) {
+            if (!this.config.relay.testMode && mobileData === undefined) {
                 return res.status(200).json(ResponseMessage.getErrorMessage("2005"));
             }
 
@@ -959,7 +953,7 @@ export class PaymentRouter {
 
                 const mobileData = await this.storage.getMobile(shopInfo.account, MobileType.SHOP_APP);
 
-                if (!process.env.TESTING && mobileData === undefined) {
+                if (!this.config.relay.testMode && mobileData === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2005"));
                 }
 

diff --git a/packages/relay/src/routers/ShopRouter.ts b/packages/relay/src/routers/ShopRouter.ts
@@ -607,7 +607,7 @@ export class ShopRouter {
 
                 const mobileData = await this.storage.getMobile(item.account, MobileType.SHOP_APP);
 
-                if (!process.env.TESTING && mobileData === undefined) {
+                if (!this.config.relay.testMode && mobileData === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2005"));
                 }
 
@@ -874,7 +874,7 @@ export class ShopRouter {
                 /// 사용자에게 푸쉬 메세지 발송
                 const mobileData = await this.storage.getMobile(item.account, MobileType.SHOP_APP);
 
-                if (!process.env.TESTING && mobileData === undefined) {
+                if (!this.config.relay.testMode && mobileData === undefined) {
                     return res.status(200).json(ResponseMessage.getErrorMessage("2005"));
                 }