fix(NODE-4817): Remove unneeded code

src/utils.ts

@@ -311,77 +311,6 @@ export function defaultMsgHandler(name: string, option: string): string {
   return `${name} option [${option}] is deprecated and will be removed in a later version.`;
 }
 
-export interface DeprecateOptionsConfig {
-  /** function name */
-  name: string;
-  /** options to deprecate */
-  deprecatedOptions: string[];
-  /** index of options object in function arguments array */
-  optionsIndex: number;
-  /** optional custom message handler to generate warnings */
-  msgHandler?(this: void, name: string, option: string): string;
-}
-
-/**
- * Deprecates a given function's options.
- * @internal
- *
- * @param this - the bound class if this is a method
- * @param config - configuration for deprecation
- * @param fn - the target function of deprecation
- * @returns modified function that warns once per deprecated option, and executes original function
- */
-export function deprecateOptions(
-  this: unknown,
-  config: DeprecateOptionsConfig,
-  fn: (...args: any[]) => any
-): any {
-  if ((process as any).noDeprecation === true) {
-    return fn;
-  }
-
-  const msgHandler = config.msgHandler ? config.msgHandler : defaultMsgHandler;
-
-  const optionsWarned = new Set();
-  function deprecated(this: any, ...args: any[]) {
-    const options = args[config.optionsIndex] as AnyOptions;
-
-    // ensure options is a valid, non-empty object, otherwise short-circuit
-    if (!isObject(options) || Object.keys(options).length === 0) {
-      return fn.bind(this)(...args); // call the function, no change
-    }
-
-    // interrupt the function call with a warning
-    for (const deprecatedOption of config.deprecatedOptions) {
-      if (deprecatedOption in options && !optionsWarned.has(deprecatedOption)) {
-        optionsWarned.add(deprecatedOption);
-        const msg = msgHandler(config.name, deprecatedOption);
-        emitWarning(msg);
-        if (this && 'getLogger' in this) {
-          const logger = this.getLogger();
-          if (logger) {
-            logger.warn(msg);
-          }
-        }
-      }
-    }
-
-    return fn.bind(this)(...args);
-  }
-
-  // These lines copied from https://github.com/nodejs/node/blob/25e5ae41688676a5fd29b2e2e7602168eee4ceb5/lib/internal/util.js#L73-L80
-  // The wrapper will keep the same prototype as fn to maintain prototype chain
-  Object.setPrototypeOf(deprecated, fn);
-  if (fn.prototype) {
-    // Setting this (rather than using Object.setPrototype, as above) ensures
-    // that calling the unwrapped constructor gives an instanceof the wrapped
-    // constructor.
-    deprecated.prototype = fn.prototype;
-  }
-
-  return deprecated;
-}
-
 /** @internal */
 export function ns(ns: string): MongoDBNamespace {
   return MongoDBNamespace.fromString(ns);

test/tools/utils.ts

@@ -5,7 +5,7 @@ import { Readable } from 'stream';
 import { setTimeout } from 'timers';
 import { inspect, promisify } from 'util';
 
-import { deprecateOptions, DeprecateOptionsConfig, Document, OP_MSG } from '../mongodb';
+import { Document, OP_MSG } from '../mongodb';
 import { runUnifiedSuite } from './unified-spec-runner/runner';
 import {
   CollectionData,
@@ -17,46 +17,10 @@ import {
   UnifiedSuite
 } from './unified-spec-runner/schema';
 
-export function makeTestFunction(config: DeprecateOptionsConfig) {
-  const fn = (options: any) => {
-    if (options) options = null;
-  };
-  return deprecateOptions(config, fn);
-}
-
 export function ensureCalledWith(stub: any, args: any[]) {
   args.forEach((m: any) => expect(stub).to.have.been.calledWith(m));
 }
 
-// TODO(NODE-4817): Dependent on whehter or not we need the tests that use these in 
-// test/unit/assorted/deprecate_warning_test.js, we may be able to delete these classes
-
-// creation of class without a logger
-export function ClassWithoutLogger() {
-  // empty function for class
-}
-
-ClassWithoutLogger.prototype.f = makeTestFunction({
-  name: 'f',
-  deprecatedOptions: ['maxScan', 'snapshot', 'fields'],
-  optionsIndex: 0
-});
-
-// creation of class where getLogger returns undefined
-export function ClassWithUndefinedLogger() {
-  // empty function for class
-}
-
-ClassWithUndefinedLogger.prototype.f = makeTestFunction({
-  name: 'f',
-  deprecatedOptions: ['maxScan', 'snapshot', 'fields'],
-  optionsIndex: 0
-});
-
-ClassWithUndefinedLogger.prototype.getLogger = function () {
-  return undefined;
-};
-
 export class EventCollector {
   private _events: Record<string, any[]>;
   private _timeout: number;

test/unit/sdam/srv_polling.test.ts

@@ -13,7 +13,6 @@ import {
   TopologyType
 } from '../../mongodb';
 import * as sdamEvents from '../../mongodb';
-import { sleep } from '../../tools/utils';
 
 describe('Mongos SRV Polling', function () {
   const SRV_HOST = 'darmok.tanagra.com';
@@ -87,29 +86,6 @@ describe('Mongos SRV Polling', function () {
         expect(poller.schedule).to.have.been.calledOnce;
         expect(poller).to.have.property('haMode', true);
       });
-
-      it.skip('should do something if dns API breaks', async function () {
-        const poller = new SrvPoller({
-          srvHost: SRV_HOST,
-          heartbeatFrequencyMS: 100
-        });
-
-        // set haMode to make the poller use the 100ms heartbeat, otherwise this test would take 60 secs
-        poller.haMode = true;
-
-        // @ts-expect-error: Testing what happens if node breaks DNS API
-        sinon.stub(dns.promises, 'resolveSrv').resolves(null);
-
-        const loggerError = sinon.stub(poller.logger, 'error').returns();
-
-        poller.schedule();
-        await sleep(130);
-        clearTimeout(poller._timeout);
-
-        expect(loggerError).to.have.been.calledOnceWith(
-          sinon.match(/Unexpected MongoRuntimeError/)
-        );
-      }).skipReason = 'TODO(NODE-4817): determine whether or not to keep this here';
     });
 
     describe('poll', function () {