From 524f0cfaea8b80aa5083de52887ab3aee68ba4ad Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:46:32 -0800
Subject: [PATCH] Update mock server and drop /etc/hosts requirement

---
 .github/workflows/benchmark.yml | 3 ---
 .github/workflows/ci.yml        | 3 ---
 package.json                    | 2 +-
 ts/test-mock/bootstrap.ts       | 2 +-
 yarn.lock                       | 8 ++++----
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 3d18ba08b847..ff255c684731 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -50,9 +50,6 @@ jobs:
     - name: Bundle
       run: yarn build:webpack
 
-    - name: Setup hosts
-      run: sudo echo "127.0.0.1 mock.signal.org" | sudo tee -a /etc/hosts
-
     - name: Run startup benchmarks
       run: |
         set -o pipefail
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e9a98baf596..b5e30c7e0a07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -198,9 +198,6 @@ jobs:
     - name: Bundle
       run: yarn build:webpack
 
-    - name: Setup hosts
-      run: sudo echo "127.0.0.1 mock.signal.org" | sudo tee -a /etc/hosts
-
     - name: Run storage service tests
       run: |
         set -o pipefail
diff --git a/package.json b/package.json
index 53030b91a78f..77b7ff251e90 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
     "@babel/preset-typescript": "7.16.0",
     "@chanzuckerberg/axe-storybook-testing": "3.0.2",
     "@electron/fuses": "1.5.0",
-    "@signalapp/mock-server": "1.1.1",
+    "@signalapp/mock-server": "1.1.2",
     "@storybook/addon-actions": "5.1.11",
     "@storybook/addon-knobs": "5.1.11",
     "@storybook/addons": "5.1.11",
diff --git a/ts/test-mock/bootstrap.ts b/ts/test-mock/bootstrap.ts
index 17a47f5c0855..9719e5ae4dc3 100644
--- a/ts/test-mock/bootstrap.ts
+++ b/ts/test-mock/bootstrap.ts
@@ -270,7 +270,7 @@ export class Bootstrap {
   //
 
   private async generateConfig(port: number): Promise<string> {
-    const url = `https://mock.signal.org:${port}`;
+    const url = `https://127.0.0.1:${port}`;
     return JSON.stringify({
       ...(await loadCertificates()),
 
diff --git a/yarn.lock b/yarn.lock
index fac5ac7d4707..6959c05aeade 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1349,10 +1349,10 @@
     "@react-spring/shared" "~9.4.0"
     "@react-spring/types" "~9.4.0"
 
-"@signalapp/mock-server@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-1.1.1.tgz#b290feeb107a3d644851708ff31bb4cd9733aa87"
-  integrity sha512-bk+fMFwRtwE4zbhryIhqPoumXX1L91kJQbHjfl2i4If47LDM9ik44vVGblIqO7l8Wf1nKDD/tTemZU5w69f5qA==
+"@signalapp/mock-server@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-1.1.2.tgz#008c46cd6f29cb5b91a3414c9c74bc770021b853"
+  integrity sha512-rkxPzbbiD6HMeeb6fe7li5H7jwzJuWQPuA7tP74KYoRLf0LeFlbRdHSrqZ4GxpA63Zu0vzC3h2bC8E2F1JM4Eg==
   dependencies:
     "@signalapp/signal-client" "0.12.1"
     debug "^4.3.2"