do not create or drop eccCollection

Author: kevinAlbs

src/libmongoc/src/mongoc/mongoc-collection.c

@@ -1055,10 +1055,8 @@ drop_with_opts_with_encryptedFields (mongoc_collection_t *collection,
                                      bson_error_t *error)
 {
    char *escName = NULL;
-   char *eccName = NULL;
    char *ecocName = NULL;
    mongoc_collection_t *escCollection = NULL;
-   mongoc_collection_t *eccCollection = NULL;
    mongoc_collection_t *ecocCollection = NULL;
    bool ok = false;
    const char *name = mongoc_collection_get_name (collection);
@@ -1087,23 +1085,6 @@ drop_with_opts_with_encryptedFields (mongoc_collection_t *collection,
       }
    }
 
-   /* Drop ECC collection. */
-   eccName = _mongoc_get_encryptedField_state_collection (
-      encryptedFields, name, "ecc", error);
-   if (!eccName) {
-      goto fail;
-   }
-
-   eccCollection = mongoc_client_get_collection (
-      collection->client, collection->db, eccName);
-   if (!drop_with_opts (eccCollection, NULL /* opts */, error)) {
-      if (error->code == MONGOC_SERVER_ERR_NS_NOT_FOUND) {
-         memset (error, 0, sizeof (bson_error_t));
-      } else {
-         goto fail;
-      }
-   }
-
    /* Drop ECOC collection. */
    ecocName = _mongoc_get_encryptedField_state_collection (
       encryptedFields, name, "ecoc", error);
@@ -1134,8 +1115,6 @@ drop_with_opts_with_encryptedFields (mongoc_collection_t *collection,
 fail:
    mongoc_collection_destroy (ecocCollection);
    bson_free (ecocName);
-   mongoc_collection_destroy (eccCollection);
-   bson_free (eccName);
    mongoc_collection_destroy (escCollection);
    bson_free (escName);
    return ok;

src/libmongoc/src/mongoc/mongoc-database.c

@@ -1015,15 +1015,13 @@ _mongoc_get_encryptedField_state_collection (
 
    if (0 == strcmp (state_collection_suffix, "esc")) {
       fieldName = "escCollection";
-   } else if (0 == strcmp (state_collection_suffix, "ecc")) {
-      fieldName = "eccCollection";
    } else if (0 == strcmp (state_collection_suffix, "ecoc")) {
       fieldName = "ecocCollection";
    } else {
       bson_set_error (error,
                       MONGOC_ERROR_COMMAND,
                       MONGOC_ERROR_COMMAND_INVALID_ARG,
-                      "expected state_collection_suffix to be 'esc', 'ecc', or "
+                      "expected state_collection_suffix to be 'esc' or "
                       "'ecoc', got: %s",
                       state_collection_suffix);
       return NULL;
@@ -1100,8 +1098,6 @@ create_collection_with_encryptedFields (mongoc_database_t *database,
    bool state_collections_ok =
       create_encField_state_collection (
          database, encryptedFields, name, "esc", error) &&
-      create_encField_state_collection (
-         database, encryptedFields, name, "ecc", error) &&
       create_encField_state_collection (
          database, encryptedFields, name, "ecoc", error);
    if (!state_collections_ok) {