test: fix tests

src/lib/probe-override.ts

@@ -1,18 +1,9 @@
-import type { Knex } from 'knex';
 import { getIndex } from '../probe/builder.js';
 import type { Probe } from '../probe/types.js';
-import { AdoptedProbes } from './adopted-probes.js';
-import type { fetchRawProbes as serverFetchRawProbes } from './ws/server.js';
+import type { AdoptedProbes } from './adopted-probes.js';
 
 export class ProbeOverride {
-	private readonly adoptedProbes: AdoptedProbes;
-
-	constructor (
-		private readonly sql: Knex,
-		private readonly fetchRawProbes: typeof serverFetchRawProbes,
-	) {
-		this.adoptedProbes = new AdoptedProbes(this.sql, this.fetchRawProbes);
-	}
+	constructor (private readonly adoptedProbes: AdoptedProbes) {}
 
 	async syncDashboardData () {
 		await this.adoptedProbes.syncDashboardData();

src/lib/ws/server.ts

@@ -8,6 +8,7 @@ import { SyncedProbeList } from './synced-probe-list.js';
 import { client } from '../sql/client.js';
 import { ProbeOverride } from '../probe-override.js';
 import { ProbeIpLimit } from './helper/probe-ip-limit.js';
+import { AdoptedProbes } from '../adopted-probes.js';
 
 export type SocketData = {
 	probe: Probe;
@@ -91,6 +92,8 @@ export const fetchRawProbes = async (): Promise<Probe[]> => {
 	return syncedProbeList.getRawProbes();
 };
 
-export const probeOverride = new ProbeOverride(client, fetchRawProbes);
+export const adoptedProbes = new AdoptedProbes(client, fetchRawProbes);
+
+export const probeOverride = new ProbeOverride(adoptedProbes);
 
 export const probeIpLimit = new ProbeIpLimit(fetchProbes, fetchRawSockets);

test/tests/integration/measurement/create-measurement.test.ts

@@ -5,22 +5,22 @@ import nock from 'nock';
 import type { Socket } from 'socket.io-client';
 import nockGeoIpProviders from '../../../utils/nock-geo-ip.js';
 import { client } from '../../../../src/lib/sql/client.js';
-import type { AdoptedProbes } from '../../../../src/lib/adopted-probes.js';
+import type { ProbeOverride } from '../../../../src/lib/probe-override.js';
 import { waitForProbesUpdate } from '../../../utils/server.js';
 
 describe('Create measurement', () => {
 	let addFakeProbe: () => Promise<Socket>;
 	let deleteFakeProbes: () => Promise<void>;
 	let getTestServer;
 	let requestAgent: Agent;
-	let adoptedProbes: AdoptedProbes;
+	let probeOverride: ProbeOverride;
 	let ADOPTED_PROBES_TABLE: string;
 
 	before(async () => {
 		await td.replaceEsm('../../../../src/lib/ip-ranges.ts', { getRegion: () => 'gcp-us-west4', populateMemList: () => Promise.resolve() });
 		({ getTestServer, addFakeProbe, deleteFakeProbes } = await import('../../../utils/server.js'));
 		({ ADOPTED_PROBES_TABLE } = await import('../../../../src/lib/adopted-probes.js'));
-		({ adoptedProbes } = await import('../../../../src/lib/ws/server.js'));
+		({ probeOverride } = await import('../../../../src/lib/ws/server.js'));
 		const app = await getTestServer();
 		requestAgent = request(app);
 	});
@@ -666,7 +666,7 @@ describe('Create measurement', () => {
 					asn: 61004,
 				});
 
-				await adoptedProbes.syncDashboardData();
+				await probeOverride.syncDashboardData();
 				await waitForProbesUpdate();
 			});
 

test/tests/integration/probes/get-probes.test.ts

@@ -5,7 +5,7 @@ import request, { type Agent } from 'supertest';
 import { getTestServer, addFakeProbe, deleteFakeProbes, waitForProbesUpdate } from '../../../utils/server.js';
 import nockGeoIpProviders from '../../../utils/nock-geo-ip.js';
 import { ADOPTED_PROBES_TABLE } from '../../../../src/lib/adopted-probes.js';
-import { adoptedProbes } from '../../../../src/lib/ws/server.js';
+import { probeOverride } from '../../../../src/lib/ws/server.js';
 import { client } from '../../../../src/lib/sql/client.js';
 
 describe('Get Probes', () => {
@@ -290,7 +290,7 @@ describe('Get Probes', () => {
 					asn: 61004,
 				});
 
-				await adoptedProbes.syncDashboardData();
+				await probeOverride.syncDashboardData();
 			});
 
 			after(async () => {

test/tests/unit/ws/synced-probe-list.test.ts

@@ -7,6 +7,7 @@ import { type AdoptedProbe, AdoptedProbes } from '../../../../src/lib/adopted-pr
 import type { Probe } from '../../../../src/probe/types.js';
 import { getRegionByCountry } from '../../../../src/lib/location/location.js';
 import { getRedisClient } from '../../../../src/lib/redis/client.js';
+import { ProbeOverride } from '../../../../src/lib/probe-override.js';
 
 describe('SyncedProbeList', () => {
 	const sandbox = sinon.createSandbox();
@@ -35,6 +36,7 @@ describe('SyncedProbeList', () => {
 	} as unknown as WsServerNamespace;
 
 	const adoptedProbes = sandbox.createStubInstance(AdoptedProbes);
+	const probeOverride = new ProbeOverride(adoptedProbes);
 
 	let syncedProbeList: SyncedProbeList;
 
@@ -46,7 +48,7 @@ describe('SyncedProbeList', () => {
 		adoptedProbes.getUpdatedLocation.callThrough();
 		adoptedProbes.getUpdatedTags.callThrough();
 
-		syncedProbeList = new SyncedProbeList(redisClient, ioNamespace, adoptedProbes);
+		syncedProbeList = new SyncedProbeList(redisClient, ioNamespace, probeOverride);
 	});
 
 	afterEach(() => {