diff --git a/addon/mongocrypt.cc b/addon/mongocrypt.cc index 1688b11..4ed2a8a 100644 --- a/addon/mongocrypt.cc +++ b/addon/mongocrypt.cc @@ -514,9 +514,7 @@ MongoCrypt::MongoCrypt(const CallbackInfo& info) mongocrypt_setopt_bypass_query_analysis(_mongo_crypt.get()); } - if (options.Get("rangeV2").ToBoolean()) { - mongocrypt_setopt_use_range_v2(_mongo_crypt.get()); - } + mongocrypt_setopt_use_range_v2(_mongo_crypt.get()); mongocrypt_setopt_use_need_kms_credentials_state(_mongo_crypt.get()); @@ -596,10 +594,10 @@ Value MongoCrypt::MakeExplicitEncryptionContext(const CallbackInfo& info) { throw TypeError::New(Env(), errorStringFromStatus(context.get())); } - if (strcasecmp(algorithm.c_str(), "rangepreview") == 0) { + if (strcasecmp(algorithm.c_str(), "range") == 0) { if (!options.Has("rangeOptions")) { throw TypeError::New( - Env(), "`rangeOptions` must be provided if `algorithm` is set to RangePreview"); + Env(), "`rangeOptions` must be provided if `algorithm` is set to Range"); } Uint8Array rangeOptions = Uint8ArrayFromValue(options["rangeOptions"], "rangeOptions"); diff --git a/src/index.ts b/src/index.ts index b47218b..7355840 100644 --- a/src/index.ts +++ b/src/index.ts @@ -40,8 +40,6 @@ export interface MongoCryptConstructor { cryptSharedLibSearchPaths?: string[]; cryptSharedLibPath?: string; bypassQueryAnalysis?: boolean; - /** @experimental */ - rangeV2?: boolean; }): MongoCrypt; libmongocryptVersion: string; } diff --git a/test/bindings.test.ts b/test/bindings.test.ts index c91e86b..186bc01 100644 --- a/test/bindings.test.ts +++ b/test/bindings.test.ts @@ -341,17 +341,17 @@ describe('MongoCryptConstructor', () => { }); }); - context('when algorithm is `rangePreview', () => { + context('when algorithm is `Range', () => { it('throws a TypeError if rangeOptions is not provided', () => { expect(() => mc.makeExplicitEncryptionContext(value, { // minimum required arguments from libmongocrypt keyId: keyId.buffer, expressionMode: false, - algorithm: 'rangePreview' + algorithm: 'Range' }) ) - .to.throw(/`rangeOptions` must be provided if `algorithm` is set to RangePreview/) + .to.throw(/`rangeOptions` must be provided if `algorithm` is set to Range/) .to.be.instanceOf(TypeError); }); @@ -361,7 +361,7 @@ describe('MongoCryptConstructor', () => { // minimum required arguments from libmongocrypt keyId: keyId.buffer, expressionMode: false, - algorithm: 'rangePreview', + algorithm: 'Range', rangeOptions: 'non-buffer' }) ) @@ -369,18 +369,18 @@ describe('MongoCryptConstructor', () => { .to.be.instanceOf(TypeError); }); - it('checks if `rangePreview` is set case-insensitive', () => { + it('checks if `Range` is set case-insensitive', () => { expect( mc.makeExplicitEncryptionContext(value, { // minimum required arguments from libmongocrypt keyId: keyId.buffer, expressionMode: false, - algorithm: 'RANGEPREVIEW', + algorithm: 'RANGE', rangeOptions: serialize({ sparsity: new Long(42) }), - // contention factor is required for `rangePreview` but + // contention factor is required for `Range` but // is enforced in libmongocrypt, not our bindings contentionFactor: 2 })