resync fle2v2 tests

Author: kevinAlbs

mongocryptd.pid

@@ -0,0 +1 @@
+{ "port" : 27020, "pid" : 25272 }

src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-BypassQueryAnalysis.json

@@ -14,9 +14,6 @@
   "collection_name": "default",
   "data": [],
   "encrypted_fields": {
-    "escCollection": "enxcol_.default.esc",
-    "eccCollection": "enxcol_.default.ecc",
-    "ecocCollection": "enxcol_.default.ecoc",
     "fields": [
       {
         "keyId": {

src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-Compact.json

@@ -14,9 +14,6 @@
   "collection_name": "default",
   "data": [],
   "encrypted_fields": {
-    "escCollection": "enxcol_.default.esc",
-    "eccCollection": "enxcol_.default.ecc",
-    "ecocCollection": "enxcol_.default.ecoc",
     "fields": [
       {
         "keyId": {

src/libmongoc/tests/json/client_side_encryption/legacy/fle2v2-CreateCollection-OldServer.json

@@ -22,16 +22,14 @@
           },
           "encryptedFieldsMap": {
             "default.encryptedCollection": {
-              "escCollection": "enxcol_.encryptedCollection.esc",
-              "ecocCollection": "enxcol_.encryptedCollection.ecoc",
               "fields": [
                 {
                   "path": "firstName",
                   "bsonType": "string",
                   "keyId": {
                     "$binary": {
-                      "subType": "04",
-                      "base64": "AAAAAAAAAAAAAAAAAAAAAA=="
+                      "base64": "AAAAAAAAAAAAAAAAAAAAAA==",
+                      "subType": "04"
                     }
                   }
                 }