From ffc90a0c30588911d4db65818458fb8438c640b1 Mon Sep 17 00:00:00 2001
From: Robert <robertbrignull@github.com>
Date: Tue, 19 Sep 2023 16:28:36 +0100
Subject: [PATCH] Remove startServer method as it now does nothing

---
 .../src/common/mock-gh-api/mock-gh-api-server.ts | 16 ----------------
 .../vscode/vscode-mock-gh-api-server.ts          |  8 +-------
 .../gh-api/gh-api-client.test.ts                 |  1 -
 ...riant-analysis-submission-integration.test.ts |  1 -
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts
index a624022c9..a0bb9408e 100644
--- a/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts
+++ b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts
@@ -12,30 +12,18 @@ import { getDirectoryNamesInsidePath } from "../files";
  * Enables mocking of the GitHub API server via HTTP interception, using msw.
  */
 export class MockGitHubApiServer extends DisposableObject {
-  private _isListening: boolean;
-
   private readonly server: SetupServer;
   private readonly recorder: Recorder;
 
   constructor() {
     super();
-    this._isListening = false;
 
     this.server = setupServer();
     this.recorder = this.push(new Recorder(this.server));
   }
 
-  public startServer(): void {
-    if (this._isListening) {
-      return;
-    }
-
-    this._isListening = true;
-  }
-
   public stopServer(): void {
     this.server.close();
-    this._isListening = false;
   }
 
   public async loadScenario(
@@ -111,10 +99,6 @@ export class MockGitHubApiServer extends DisposableObject {
     return await getDirectoryNamesInsidePath(scenariosPath);
   }
 
-  public get isListening(): boolean {
-    return this._isListening;
-  }
-
   public get isRecording(): boolean {
     return this.recorder.isRecording;
   }
diff --git a/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts b/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts
index aae2fa8ca..9d4d5dcac 100644
--- a/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts
+++ b/extensions/ql-vscode/src/common/mock-gh-api/vscode/vscode-mock-gh-api-server.ts
@@ -42,10 +42,6 @@ export class VSCodeMockGitHubApiServer extends DisposableObject {
     };
   }
 
-  public async startServer(): Promise<void> {
-    this.server.startServer();
-  }
-
   public async stopServer(): Promise<void> {
     this.server.stopServer();
 
@@ -256,9 +252,7 @@ export class VSCodeMockGitHubApiServer extends DisposableObject {
   }
 
   private async onConfigChange(): Promise<void> {
-    if (this.config.mockServerEnabled && !this.server.isListening) {
-      await this.startServer();
-    } else if (!this.config.mockServerEnabled && this.server.isListening) {
+    if (!this.config.mockServerEnabled) {
       await this.stopServer();
     }
   }
diff --git a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts
index b03b107cb..351d22dda 100644
--- a/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts
+++ b/extensions/ql-vscode/test/unit-tests/variant-analysis/gh-api/gh-api-client.test.ts
@@ -13,7 +13,6 @@ import { response as variantAnalysisRepoJson_response } from "../../../../src/co
 import { testCredentialsWithRealOctokit } from "../../../factories/authentication";
 
 const mockServer = new MockGitHubApiServer();
-beforeAll(() => mockServer.startServer());
 afterEach(() => mockServer.unloadScenario());
 afterAll(() => mockServer.stopServer());
 
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts
index 458b3d7bd..a6e4ce1d0 100644
--- a/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts
+++ b/extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-submission-integration.test.ts
@@ -16,7 +16,6 @@ import { createVSCodeCommandManager } from "../../../../src/common/vscode/comman
 import { AllCommands } from "../../../../src/common/commands";
 
 const mockServer = new MockGitHubApiServer();
-beforeAll(() => mockServer.startServer());
 afterEach(() => mockServer.unloadScenario());
 afterAll(() => mockServer.stopServer());