pr feedback: undo test changes and remove ByteUtils

Author: PavelSafronov

src/utils.ts

@@ -9,7 +9,7 @@ import { clearTimeout, setTimeout } from 'timers';
 import {
   allocateBuffer,
   allocateUnsafeBuffer,
-  ByteUtils as BSONByteUtils,
+  ByteUtils,
   deserialize,
   type Document,
   getInt32LE,
@@ -53,24 +53,6 @@ export type Callback<T = any> = (error?: AnyError, result?: T) => void;
 
 export type AnyOptions = Document;
 
-export const ByteUtils = {
-  toLocalBufferType(this: void, buffer: Buffer | Uint8Array): Buffer {
-    return BSONByteUtils.toLocalBufferType(buffer) as Buffer;
-  },
-
-  equals(this: void, seqA: Uint8Array, seqB: Uint8Array) {
-    return ByteUtils.toLocalBufferType(seqA).equals(seqB);
-  },
-
-  compare(this: void, seqA: Uint8Array, seqB: Uint8Array) {
-    return ByteUtils.toLocalBufferType(seqA).compare(seqB);
-  },
-
-  toBase64(this: void, uint8array: Uint8Array) {
-    return ByteUtils.toLocalBufferType(uint8array).toString('base64');
-  }
-};
-
 /**
  * Returns true if value is a Uint8Array or a Buffer
  * @param value - any value that may be a Uint8Array
@@ -1338,10 +1320,10 @@ export function decorateDecryptionResult(
 ): void {
   if (isTopLevelDecorateCall) {
     // The original value could have been either a JS object or a BSON buffer
-    if (BSONByteUtils.isUint8Array(original)) {
+    if (ByteUtils.isUint8Array(original)) {
       original = deserialize(original);
     }
-    if (BSONByteUtils.isUint8Array(decrypted)) {
+    if (ByteUtils.isUint8Array(decrypted)) {
       throw new MongoRuntimeError('Expected result of decryption to be deserialized BSON object');
     }
   }

test/tools/runner/config.ts

@@ -19,7 +19,6 @@ import {
   TopologyType,
   type WriteConcernSettings
 } from '../../../src';
-import { ByteUtils } from '../../../src/bson';
 import { type CompressorName } from '../../../src/cmap/wire_protocol/compression';
 import { HostAddress } from '../../../src/utils';
 import { getEnvironmentalOptions } from '../utils';
@@ -494,7 +493,7 @@ export class TestConfiguration {
                   // @ts-expect-error: toExtendedJSON internal on double but not on long
                   return { number: new Double(value).toExtendedJSON() };
               }
-              if (ByteUtils.isUint8Array(value))
+              if (Buffer.isBuffer(value))
                 return { [value.constructor.name]: Buffer.prototype.base64Slice.call(value) };
               if (value === undefined) return { undefined: 'key was set but equal to undefined' };
               return value;

test/unit/cmap/commands.test.ts

@@ -1,7 +1,6 @@
 import * as BSON from 'bson';
 import { expect } from 'chai';
 
-import { ByteUtils, readInt32LE } from '../../../src/bson';
 import { DocumentSequence, OpMsgRequest, OpReply } from '../../../src/cmap/commands';
 
 describe('commands', function () {
@@ -42,12 +41,12 @@ describe('commands', function () {
 
           it('sets the length of the document sequence', function () {
             // Bytes starting at index 1 is a 4 byte length.
-            expect(readInt32LE(buffers[3], 1)).to.equal(25);
+            expect(buffers[3].readInt32LE(1)).to.equal(25);
           });
 
           it('sets the name of the first field to be replaced', function () {
             // Bytes starting at index 5 is the field name.
-            expect(ByteUtils.toUTF8(buffers[3], 5, 10, true)).to.equal('field');
+            expect(buffers[3].toString('utf8', 5, 10)).to.equal('field');
           });
         });
 
@@ -82,12 +81,12 @@ describe('commands', function () {
 
           it('sets the length of the first document sequence', function () {
             // Bytes starting at index 1 is a 4 byte length.
-            expect(readInt32LE(buffers[3], 1)).to.equal(28);
+            expect(buffers[3].readInt32LE(1)).to.equal(28);
           });
 
           it('sets the name of the first field to be replaced', function () {
             // Bytes starting at index 5 is the field name.
-            expect(ByteUtils.toUTF8(buffers[3], 5, 13, true)).to.equal('fieldOne');
+            expect(buffers[3].toString('utf8', 5, 13)).to.equal('fieldOne');
           });
 
           it('sets the document sequence sections second type to 1', function () {
@@ -97,12 +96,12 @@ describe('commands', function () {
 
           it('sets the length of the second document sequence', function () {
             // Bytes starting at index 1 is a 4 byte length.
-            expect(readInt32LE(buffers[3], 30)).to.equal(28);
+            expect(buffers[3].readInt32LE(30)).to.equal(28);
           });
 
           it('sets the name of the second field to be replaced', function () {
             // Bytes starting at index 33 is the field name.
-            expect(ByteUtils.toUTF8(buffers[3], 34, 42, true)).to.equal('fieldTwo');
+            expect(buffers[3].toString('utf8', 34, 42)).to.equal('fieldTwo');
           });
         });
       });

test/unit/utils.test.ts

@@ -1,6 +1,6 @@
 import { setTimeout } from 'node:timers';
 
-import { ObjectId } from 'bson';
+import { ByteUtils, ObjectId } from 'bson';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
@@ -10,7 +10,6 @@ import { decorateWithExplain, Explain } from '../../src/explain';
 import {
   abortable,
   BufferPool,
-  ByteUtils,
   checkParentDomainMatch,
   compareObjectId,
   hasAtomicOperators,