@pact-foundation/pact-core 13.4.1-beta.13 → 13.4.1-beta.16

package/src/ffi/pact.h

@@ -11,15 +11,16 @@
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
 
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
 
 /**
  * Request or Response enum
  */
-typedef enum InteractionPart {
+enum class InteractionPart {
   /**
    * Request part
    */
@@ -28,7 +29,7 @@ typedef enum InteractionPart {
    * Response part
    */
   InteractionPart_Response,
-} InteractionPart;
+};
 
 /**
  * An enum representing the log level to use.
@@ -36,19 +37,19 @@ typedef enum InteractionPart {
  * This enum is passed to `log_attach_sink`, which defines where to direct
  * log output at the specified level or lower.
  */
-typedef enum LevelFilter {
+enum class LevelFilter {
   LevelFilter_Off,
   LevelFilter_Error,
   LevelFilter_Warn,
   LevelFilter_Info,
   LevelFilter_Debug,
   LevelFilter_Trace,
-} LevelFilter;
+};
 
 /**
  * Enum defining the pact specification versions supported by the library
  */
-typedef enum PactSpecification {
+enum class PactSpecification {
   /**
    * Unknown or unsupported specification version
    */
@@ -73,17 +74,17 @@ typedef enum PactSpecification {
    * Version four of the pact specification (<https://github.com/pact-foundation/pact-specification/tree/version-4>)
    */
   PactSpecification_V4,
-} PactSpecification;
+};
 
 /**
  * Struct that defines the consumer of the pact.
  */
-typedef struct Consumer Consumer;
+struct Consumer;
 
 /**
  * Struct that defines a message.
  */
-typedef struct Message Message;
+struct Message;
 
 /**
  * An iterator that enables FFI iteration over metadata by putting all the keys on the heap
@@ -91,19 +92,19 @@ typedef struct Message Message;
  *
  * This assumes no mutation of the underlying metadata happens while the iterator is live.
  */
-typedef struct MessageMetadataIterator MessageMetadataIterator;
+struct MessageMetadataIterator;
 
 /**
  * Struct that represents a pact between the consumer and provider of a service.
  * It contains a list of Messages instead of Interactions, but is otherwise
  * identical to `struct Pact`.
  */
-typedef struct MessagePact MessagePact;
+struct MessagePact;
 
 /**
  * An iterator over messages in a message pact.
  */
-typedef struct MessagePactMessageIterator MessagePactMessageIterator;
+struct MessagePactMessageIterator;
 
 /**
  * An iterator that enables FFI iteration over metadata by putting all the keys on the heap
@@ -111,47 +112,47 @@ typedef struct MessagePactMessageIterator MessagePactMessageIterator;
  *
  * This assumes no mutation of the underlying metadata happens while the iterator is live.
  */
-typedef struct MessagePactMetadataIterator MessagePactMetadataIterator;
+struct MessagePactMetadataIterator;
 
 /**
  * Enum that defines the different types of mismatches that can occur.
  */
-typedef struct Mismatch Mismatch;
+struct Mismatch;
 
 /**
  * A collection of mismatches from a matching comparison.
  */
-typedef struct Mismatches Mismatches;
+struct Mismatches;
 
 /**
  * An iterator over mismatches.
  */
-typedef struct MismatchesIterator MismatchesIterator;
+struct MismatchesIterator;
 
 /**
  * An iterator over messages in a pact.
  */
-typedef struct PactMessageIterator PactMessageIterator;
+struct PactMessageIterator;
 
 /**
  * An iterator over synchronous request/response messages in a pact.
  */
-typedef struct PactSyncMessageIterator PactSyncMessageIterator;
+struct PactSyncMessageIterator;
 
 /**
  * Struct that defines a provider of a pact.
  */
-typedef struct Provider Provider;
+struct Provider;
 
 /**
  * Struct that encapsulates all the info about a provider state
  */
-typedef struct ProviderState ProviderState;
+struct ProviderState;
 
 /**
  * Iterator over individual provider states.
  */
-typedef struct ProviderStateIterator ProviderStateIterator;
+struct ProviderStateIterator;
 
 /**
  * An iterator that enables FFI iteration over provider state params by putting all the keys on the heap
@@ -159,22 +160,22 @@ typedef struct ProviderStateIterator ProviderStateIterator;
  *
  * This assumes no mutation of the underlying provider state happens while the iterator is live.
  */
-typedef struct ProviderStateParamIterator ProviderStateParamIterator;
+struct ProviderStateParamIterator;
 
 /**
  * Synchronous interactions as a request message to a sequence of response messages
  */
-typedef struct SynchronousMessage SynchronousMessage;
+struct SynchronousMessage;
 
 /**
  * Wraps a Pact verifier
  */
-typedef struct VerifierHandle VerifierHandle;
+struct VerifierHandle;
 
 /**
  * A single key-value pair exported to the C-side.
  */
-typedef struct MessageMetadataPair {
+struct MessageMetadataPair {
   /**
    * The metadata key.
    */
@@ -183,12 +184,12 @@ typedef struct MessageMetadataPair {
    * The metadata value.
    */
   const char *value;
-} MessageMetadataPair;
+};
 
 /**
  * A triple, containing the outer key, inner key, and value, exported to the C-side.
  */
-typedef struct MessagePactMetadataTriple {
+struct MessagePactMetadataTriple {
   /**
    * The outer key of the `MessagePact` metadata.
    */
@@ -201,12 +202,12 @@ typedef struct MessagePactMetadataTriple {
    * The value of the `MessagePact` metadata.
    */
   const char *value;
-} MessagePactMetadataTriple;
+};
 
 /**
  * A single key-value pair exported to the C-side.
  */
-typedef struct ProviderStateParamPair {
+struct ProviderStateParamPair {
   /**
    * The key of the `ProviderState` parameter.
    */
@@ -215,58 +216,64 @@ typedef struct ProviderStateParamPair {
    * The value of the `ProviderState` parameter.
    */
   const char *value;
-} ProviderStateParamPair;
+};
 
 /**
  * Wraps a Pact model struct
  */
-typedef uint16_t PactHandle;
+using PactHandle = uint16_t;
 
 /**
  * Result of wrapping a string value
  */
-typedef enum StringResult_Tag {
-  /**
-   * Was generated OK
-   */
-  StringResult_Ok,
-  /**
-   * There was an error generating the string
-   */
-  StringResult_Failed,
-} StringResult_Tag;
+struct StringResult {
+  enum class Tag {
+    /**
+     * Was generated OK
+     */
+    StringResult_Ok,
+    /**
+     * There was an error generating the string
+     */
+    StringResult_Failed,
+  };
+
+  struct StringResult_Ok_Body {
+    char *_0;
+  };
+
+  struct StringResult_Failed_Body {
+    char *_0;
+  };
 
-typedef struct StringResult {
-  StringResult_Tag tag;
+  Tag tag;
   union {
-    struct {
-      char *ok;
-    };
-    struct {
-      char *failed;
-    };
+    StringResult_Ok_Body ok;
+    StringResult_Failed_Body failed;
   };
-} StringResult;
+};
 
 /**
  * Wraps a Pact model struct
  */
-typedef uint32_t InteractionHandle;
+using InteractionHandle = uint32_t;
 
 /**
  * Wraps a Pact model struct
  */
-typedef uint16_t MessagePactHandle;
+using MessagePactHandle = uint16_t;
 
 /**
  * Wraps a Pact model struct
  */
-typedef uint32_t MessageHandle;
+using MessageHandle = uint32_t;
+
+extern "C" {
 
 /**
  * Get the current library version
  */
-const char *pactffi_version(void);
+const char *pactffi_version();
 
 /**
  * Initialise the mock server library, can provide an environment variable name to use to
@@ -306,55 +313,54 @@ void pactffi_log_message(const char *source, const char *log_level, const char *
  * Match a pair of messages, producing a collection of mismatches,
  * which is empty if the two messages matched.
  */
-const struct Mismatches *pactffi_match_message(const struct Message *msg_1,
-                                               const struct Message *msg_2);
+const Mismatches *pactffi_match_message(const Message *msg_1, const Message *msg_2);
 
 /**
  * Get an iterator over mismatches.
  */
-struct MismatchesIterator *pactffi_mismatches_get_iter(const struct Mismatches *mismatches);
+MismatchesIterator *pactffi_mismatches_get_iter(const Mismatches *mismatches);
 
 /**
  * Delete mismatches
  */
-void pactffi_mismatches_delete(const struct Mismatches *mismatches);
+void pactffi_mismatches_delete(const Mismatches *mismatches);
 
 /**
  * Get the next mismatch from a mismatches iterator.
  *
  * Returns a null pointer if no mismatches remain.
  */
-const struct Mismatch *pactffi_mismatches_iter_next(struct MismatchesIterator *iter);
+const Mismatch *pactffi_mismatches_iter_next(MismatchesIterator *iter);
 
 /**
  * Delete a mismatches iterator when you're done with it.
  */
-void pactffi_mismatches_iter_delete(struct MismatchesIterator *iter);
+void pactffi_mismatches_iter_delete(MismatchesIterator *iter);
 
 /**
  * Get a JSON representation of the mismatch.
  */
-const char *pactffi_mismatch_to_json(const struct Mismatch *mismatch);
+const char *pactffi_mismatch_to_json(const Mismatch *mismatch);
 
 /**
  * Get the type of a mismatch.
  */
-const char *pactffi_mismatch_type(const struct Mismatch *mismatch);
+const char *pactffi_mismatch_type(const Mismatch *mismatch);
 
 /**
  * Get a summary of a mismatch.
  */
-const char *pactffi_mismatch_summary(const struct Mismatch *mismatch);
+const char *pactffi_mismatch_summary(const Mismatch *mismatch);
 
 /**
  * Get a description of a mismatch.
  */
-const char *pactffi_mismatch_description(const struct Mismatch *mismatch);
+const char *pactffi_mismatch_description(const Mismatch *mismatch);
 
 /**
  * Get an ANSI-compatible description of a mismatch.
  */
-const char *pactffi_mismatch_ansi_description(const struct Mismatch *mismatch);
+const char *pactffi_mismatch_ansi_description(const Mismatch *mismatch);
 
 /**
  * Provide the error message from `LAST_ERROR` to the calling C code.
@@ -399,12 +405,12 @@ int pactffi_get_error_message(char *buffer,
 /**
  * Convenience function to direct all logging to stdout.
  */
-int pactffi_log_to_stdout(enum LevelFilter level_filter);
+int pactffi_log_to_stdout(LevelFilter level_filter);
 
 /**
  * Convenience function to direct all logging to stderr.
  */
-int pactffi_log_to_stderr(enum LevelFilter level_filter);
+int pactffi_log_to_stderr(LevelFilter level_filter);
 
 /**
  * Convenience function to direct all logging to a file.
@@ -413,12 +419,12 @@ int pactffi_log_to_stderr(enum LevelFilter level_filter);
  * This function will fail if the file_name pointer is invalid or does not point to a NULL
  * terminated string.
  */
-int pactffi_log_to_file(const char *file_name, enum LevelFilter level_filter);
+int pactffi_log_to_file(const char *file_name, LevelFilter level_filter);
 
 /**
  * Convenience function to direct all logging to a task local memory buffer.
  */
-int pactffi_log_to_buffer(enum LevelFilter level_filter);
+int pactffi_log_to_buffer(LevelFilter level_filter);
 
 /**
  * Initialize the thread-local logger with no sinks.
@@ -435,7 +441,7 @@ int pactffi_log_to_buffer(enum LevelFilter level_filter);
  *
  * This function is always safe to call.
  */
-void pactffi_logger_init(void);
+void pactffi_logger_init();
 
 /**
  * Attach an additional sink to the thread-local logger.
@@ -472,14 +478,14 @@ void pactffi_logger_init(void);
  * out if the specifier isn't valid UTF-8.
  */
 int pactffi_logger_attach_sink(const char *sink_specifier,
-                               enum LevelFilter level_filter);
+                               LevelFilter level_filter);
 
 /**
  * Apply the thread-local logger to the program.
  *
  * Any attempts to modify the logger after the call to `logger_apply` will fail.
  */
-int pactffi_logger_apply(void);
+int pactffi_logger_apply();
 
 /**
  * Fetch the in-memory logger buffer contents. This will only have any contents if the `buffer`
@@ -535,7 +541,7 @@ const char *pactffi_fetch_log_buffer(const char *log_id);
  * or the Rust string contains an embedded NULL byte.
  * In the case of error, a NULL pointer will be returned.
  */
-const char *pactffi_consumer_get_name(const struct Consumer *consumer);
+const char *pactffi_consumer_get_name(const Consumer *consumer);
 
 /**
  * Get a mutable pointer to a newly-created default message on the heap.
@@ -548,7 +554,7 @@ const char *pactffi_consumer_get_name(const struct Consumer *consumer);
  *
  * Returns NULL on error.
  */
-struct Message *pactffi_message_new(void);
+Message *pactffi_message_new();
 
 /**
  * Constructs a `Message` from the JSON string
@@ -561,9 +567,9 @@ struct Message *pactffi_message_new(void);
  *
  * If the JSON string is invalid or not UTF-8 encoded, returns a NULL.
  */
-struct Message *pactffi_message_new_from_json(unsigned int index,
-                                              const char *json_str,
-                                              enum PactSpecification spec_version);
+Message *pactffi_message_new_from_json(unsigned int index,
+                                       const char *json_str,
+                                       PactSpecification spec_version);
 
 /**
  * Constructs a `Message` from a body with a given content-type.
@@ -576,12 +582,12 @@ struct Message *pactffi_message_new_from_json(unsigned int index,
  *
  * If the body or content type are invalid or not UTF-8 encoded, returns NULL.
  */
-struct Message *pactffi_message_new_from_body(const char *body, const char *content_type);
+Message *pactffi_message_new_from_body(const char *body, const char *content_type);
 
 /**
  * Destroy the `Message` being pointed to.
  */
-void pactffi_message_delete(struct Message *message);
+void pactffi_message_delete(Message *message);
 
 /**
  * Get the contents of a `Message` in string form.
@@ -599,7 +605,7 @@ void pactffi_message_delete(struct Message *message);
  * no mechanism to differentiate with this function call alone between
  * a NULL message and a missing message body.
  */
-const char *pactffi_message_get_contents(const struct Message *message);
+const char *pactffi_message_get_contents(const Message *message);
 
 /**
  * Get the length of the contents of a `Message`.
@@ -613,7 +619,7 @@ const char *pactffi_message_get_contents(const struct Message *message);
  * If the message is NULL, returns 0. If the body of the message
  * is missing, then this function also returns 0.
  */
-size_t pactffi_message_get_contents_length(const struct Message *message);
+size_t pactffi_message_get_contents_length(const Message *message);
 
 /**
  * Get the contents of a `Message` as a pointer to an array of bytes.
@@ -629,7 +635,7 @@ size_t pactffi_message_get_contents_length(const struct Message *message);
  * If the message is NULL, returns NULL. If the body of the message
  * is missing, then this function also returns NULL.
  */
-const unsigned char *pactffi_message_get_contents_bin(const struct Message *message);
+const unsigned char *pactffi_message_get_contents_bin(const Message *message);
 
 /**
  * Get a copy of the description.
@@ -648,7 +654,7 @@ const unsigned char *pactffi_message_get_contents_bin(const struct Message *mess
  * This function may fail if the Rust string contains embedded
  * null ('\0') bytes.
  */
-const char *pactffi_message_get_description(const struct Message *message);
+const char *pactffi_message_get_description(const Message *message);
 
 /**
  * Write the `description` field on the `Message`.
@@ -665,7 +671,7 @@ const char *pactffi_message_get_description(const struct Message *message);
  *
  * Errors will be reported with a non-zero return value.
  */
-int pactffi_message_set_description(struct Message *message, const char *description);
+int pactffi_message_set_description(Message *message, const char *description);
 
 /**
  * Get a copy of the provider state at the given index from this message.
@@ -684,8 +690,7 @@ int pactffi_message_set_description(struct Message *message, const char *descrip
  * This function may fail if the index requested is out of bounds,
  * or if any of the Rust strings contain embedded null ('\0') bytes.
  */
-const struct ProviderState *pactffi_message_get_provider_state(const struct Message *message,
-                                                               unsigned int index);
+const ProviderState *pactffi_message_get_provider_state(const Message *message, unsigned int index);
 
 /**
  * Get an iterator over provider states.
@@ -698,7 +703,7 @@ const struct ProviderState *pactffi_message_get_provider_state(const struct Mess
  *
  * Returns NULL if an error occurs.
  */
-struct ProviderStateIterator *pactffi_message_get_provider_state_iter(struct Message *message);
+ProviderStateIterator *pactffi_message_get_provider_state_iter(Message *message);
 
 /**
  * Get the next value from the iterator.
@@ -714,12 +719,12 @@ struct ProviderStateIterator *pactffi_message_get_provider_state_iter(struct Mes
  *
  * Returns NULL if an error occurs.
  */
-struct ProviderState *pactffi_provider_state_iter_next(struct ProviderStateIterator *iter);
+ProviderState *pactffi_provider_state_iter_next(ProviderStateIterator *iter);
 
 /**
  * Delete the iterator.
  */
-void pactffi_provider_state_iter_delete(struct ProviderStateIterator *iter);
+void pactffi_provider_state_iter_delete(ProviderStateIterator *iter);
 
 /**
  * Get a copy of the metadata value indexed by `key`.
@@ -742,7 +747,7 @@ void pactffi_provider_state_iter_delete(struct ProviderStateIterator *iter);
  * invalid UTF-8, or if the Rust string contains embedded null ('\0')
  * bytes.
  */
-const char *pactffi_message_find_metadata(const struct Message *message, const char *key);
+const char *pactffi_message_find_metadata(const Message *message, const char *key);
 
 /**
  * Insert the (`key`, `value`) pair into this Message's
@@ -758,7 +763,7 @@ const char *pactffi_message_find_metadata(const struct Message *message, const c
  * This function may fail if the provided `key` or `value` strings
  * contain invalid UTF-8.
  */
-int pactffi_message_insert_metadata(struct Message *message, const char *key, const char *value);
+int pactffi_message_insert_metadata(Message *message, const char *key, const char *value);
 
 /**
  * Get an iterator over the metadata of a message.
@@ -778,7 +783,7 @@ int pactffi_message_insert_metadata(struct Message *message, const char *key, co
  * This function may fail if any of the Rust strings contain
  * embedded null ('\0') bytes.
  */
-struct MessageMetadataIterator *pactffi_message_get_metadata_iter(struct Message *message);
+MessageMetadataIterator *pactffi_message_get_metadata_iter(Message *message);
 
 /**
  * Get the next key and value out of the iterator, if possible
@@ -791,17 +796,17 @@ struct MessageMetadataIterator *pactffi_message_get_metadata_iter(struct Message
  *
  * If no further data is present, returns NULL.
  */
-struct MessageMetadataPair *pactffi_message_metadata_iter_next(struct MessageMetadataIterator *iter);
+MessageMetadataPair *pactffi_message_metadata_iter_next(MessageMetadataIterator *iter);
 
 /**
  * Free the metadata iterator when you're done using it.
  */
-void pactffi_message_metadata_iter_delete(struct MessageMetadataIterator *iter);
+void pactffi_message_metadata_iter_delete(MessageMetadataIterator *iter);
 
 /**
  * Free a pair of key and value returned from `message_metadata_iter_next`.
  */
-void pactffi_message_metadata_pair_delete(struct MessageMetadataPair *pair);
+void pactffi_message_metadata_pair_delete(MessageMetadataPair *pair);
 
 /**
  * Construct a new `MessagePact` from the JSON string.
@@ -816,12 +821,12 @@ void pactffi_message_metadata_pair_delete(struct MessageMetadataPair *pair);
  *
  * On error, this function will return a null pointer.
  */
-struct MessagePact *pactffi_message_pact_new_from_json(const char *file_name, const char *json_str);
+MessagePact *pactffi_message_pact_new_from_json(const char *file_name, const char *json_str);
 
 /**
  * Delete the `MessagePact` being pointed to.
  */
-void pactffi_message_pact_delete(struct MessagePact *message_pact);
+void pactffi_message_pact_delete(MessagePact *message_pact);
 
 /**
  * Get a pointer to the Consumer struct inside the MessagePact.
@@ -837,7 +842,7 @@ void pactffi_message_pact_delete(struct MessagePact *message_pact);
  * This function will only fail if it is passed a NULL pointer.
  * In the case of error, a NULL pointer will be returned.
  */
-struct Consumer *pactffi_message_pact_get_consumer(struct MessagePact *message_pact);
+Consumer *pactffi_message_pact_get_consumer(MessagePact *message_pact);
 
 /**
  * Get a pointer to the Provider struct inside the MessagePact.
@@ -853,7 +858,7 @@ struct Consumer *pactffi_message_pact_get_consumer(struct MessagePact *message_p
  * This function will only fail if it is passed a NULL pointer.
  * In the case of error, a NULL pointer will be returned.
  */
-struct Provider *pactffi_message_pact_get_provider(struct MessagePact *message_pact);
+Provider *pactffi_message_pact_get_provider(MessagePact *message_pact);
 
 /**
  * Get an iterator over the messages of a message pact.
@@ -873,7 +878,7 @@ struct Provider *pactffi_message_pact_get_provider(struct MessagePact *message_p
  * This function may fail if any of the Rust strings contain embedded
  * null ('\0') bytes.
  */
-struct MessagePactMessageIterator *pactffi_message_pact_get_message_iter(struct MessagePact *message_pact);
+MessagePactMessageIterator *pactffi_message_pact_get_message_iter(MessagePact *message_pact);
 
 /**
  * Get the next message from the message pact.
@@ -886,12 +891,12 @@ struct MessagePactMessageIterator *pactffi_message_pact_get_message_iter(struct
  *
  * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
  */
-struct Message *pactffi_message_pact_message_iter_next(struct MessagePactMessageIterator *iter);
+Message *pactffi_message_pact_message_iter_next(MessagePactMessageIterator *iter);
 
 /**
  * Delete the iterator.
  */
-void pactffi_message_pact_message_iter_delete(struct MessagePactMessageIterator *iter);
+void pactffi_message_pact_message_iter_delete(MessagePactMessageIterator *iter);
 
 /**
  * Get a copy of the metadata value indexed by `key1` and `key2`.
@@ -914,7 +919,7 @@ void pactffi_message_pact_message_iter_delete(struct MessagePactMessageIterator
  * invalid UTF-8, or if the Rust string contains embedded null ('\0')
  * bytes.
  */
-const char *pactffi_message_pact_find_metadata(const struct MessagePact *message_pact,
+const char *pactffi_message_pact_find_metadata(const MessagePact *message_pact,
                                                const char *key1,
                                                const char *key2);
 
@@ -936,7 +941,7 @@ const char *pactffi_message_pact_find_metadata(const struct MessagePact *message
  * This function may fail if any of the Rust strings contain
  * embedded null ('\0') bytes.
  */
-struct MessagePactMetadataIterator *pactffi_message_pact_get_metadata_iter(struct MessagePact *message_pact);
+MessagePactMetadataIterator *pactffi_message_pact_get_metadata_iter(MessagePact *message_pact);
 
 /**
  * Get the next triple out of the iterator, if possible
@@ -949,17 +954,17 @@ struct MessagePactMetadataIterator *pactffi_message_pact_get_metadata_iter(struc
  *
  * Returns null if no next element is present.
  */
-struct MessagePactMetadataTriple *pactffi_message_pact_metadata_iter_next(struct MessagePactMetadataIterator *iter);
+MessagePactMetadataTriple *pactffi_message_pact_metadata_iter_next(MessagePactMetadataIterator *iter);
 
 /**
  * Free the metadata iterator when you're done using it.
  */
-void pactffi_message_pact_metadata_iter_delete(struct MessagePactMetadataIterator *iter);
+void pactffi_message_pact_metadata_iter_delete(MessagePactMetadataIterator *iter);
 
 /**
  * Free a triple returned from `pactffi_message_pact_metadata_iter_next`.
  */
-void pactffi_message_pact_metadata_triple_delete(struct MessagePactMetadataTriple *triple);
+void pactffi_message_pact_metadata_triple_delete(MessagePactMetadataTriple *triple);
 
 /**
  * Get a copy of this provider's name.
@@ -997,7 +1002,7 @@ void pactffi_message_pact_metadata_triple_delete(struct MessagePactMetadataTripl
  * or the Rust string contains an embedded NULL byte.
  * In the case of error, a NULL pointer will be returned.
  */
-const char *pactffi_provider_get_name(const struct Provider *provider);
+const char *pactffi_provider_get_name(const Provider *provider);
 
 /**
  * Get the name of the provider state as a string, which needs to be deleted with `pactffi_string_delete`.
@@ -1010,7 +1015,7 @@ const char *pactffi_provider_get_name(const struct Provider *provider);
  *
  * If the provider_state param is NULL, this returns NULL.
  */
-const char *pactffi_provider_state_get_name(const struct ProviderState *provider_state);
+const char *pactffi_provider_state_get_name(const ProviderState *provider_state);
 
 /**
  * Get an iterator over the params of a provider state.
@@ -1030,7 +1035,7 @@ const char *pactffi_provider_state_get_name(const struct ProviderState *provider
  * This function may fail if any of the Rust strings contain
  * embedded null ('\0') bytes.
  */
-struct ProviderStateParamIterator *pactffi_provider_state_get_param_iter(struct ProviderState *provider_state);
+ProviderStateParamIterator *pactffi_provider_state_get_param_iter(ProviderState *provider_state);
 
 /**
  * Get the next key and value out of the iterator, if possible
@@ -1048,27 +1053,27 @@ struct ProviderStateParamIterator *pactffi_provider_state_get_param_iter(struct
  *
  * Returns NULL if there's no further elements or the iterator is NULL.
  */
-struct ProviderStateParamPair *pactffi_provider_state_param_iter_next(struct ProviderStateParamIterator *iter);
+ProviderStateParamPair *pactffi_provider_state_param_iter_next(ProviderStateParamIterator *iter);
 
 /**
  * Free the provider state when you're done using it.
  */
-void pactffi_provider_state_delete(struct ProviderState *provider_state);
+void pactffi_provider_state_delete(ProviderState *provider_state);
 
 /**
  * Free the provider state param iterator when you're done using it.
  */
-void pactffi_provider_state_param_iter_delete(struct ProviderStateParamIterator *iter);
+void pactffi_provider_state_param_iter_delete(ProviderStateParamIterator *iter);
 
 /**
  * Free a pair of key and value returned from `pactffi_provider_state_param_iter_next`.
  */
-void pactffi_provider_state_param_pair_delete(struct ProviderStateParamPair *pair);
+void pactffi_provider_state_param_pair_delete(ProviderStateParamPair *pair);
 
 /**
  * Free the iterator when you're done using it.
  */
-void pactffi_pact_message_iter_delete(struct PactMessageIterator *iter);
+void pactffi_pact_message_iter_delete(PactMessageIterator *iter);
 
 /**
  * Get the next message from the message pact. As the messages returned are owned by the
@@ -1085,7 +1090,7 @@ void pactffi_pact_message_iter_delete(struct PactMessageIterator *iter);
  *
  * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
  */
-struct Message *pactffi_pact_message_iter_next(struct PactMessageIterator *iter);
+Message *pactffi_pact_message_iter_next(PactMessageIterator *iter);
 
 /**
  * Get the next synchronous request/response message from the pact. As the messages returned are owned by the
@@ -1102,17 +1107,17 @@ struct Message *pactffi_pact_message_iter_next(struct PactMessageIterator *iter)
  *
  * This function will return a NULL pointer if passed a NULL pointer or if an error occurs.
  */
-struct SynchronousMessage *pactffi_pact_sync_message_iter_next(struct PactSyncMessageIterator *iter);
+SynchronousMessage *pactffi_pact_sync_message_iter_next(PactSyncMessageIterator *iter);
 
 /**
  * Free the iterator when you're done using it.
  */
-void pactffi_pact_sync_message_iter_delete(struct PactSyncMessageIterator *iter);
+void pactffi_pact_sync_message_iter_delete(PactSyncMessageIterator *iter);
 
 /**
  * Destroy the `Message` being pointed to.
  */
-void pactffi_sync_message_delete(struct SynchronousMessage *message);
+void pactffi_sync_message_delete(SynchronousMessage *message);
 
 /**
  * Get the request contents of a `SynchronousMessage` in string form.
@@ -1130,7 +1135,7 @@ void pactffi_sync_message_delete(struct SynchronousMessage *message);
  * no mechanism to differentiate with this function call alone between
  * a NULL message and a missing message body.
  */
-const char *pactffi_sync_message_get_request_contents(const struct SynchronousMessage *message);
+const char *pactffi_sync_message_get_request_contents(const SynchronousMessage *message);
 
 /**
  * Get the length of the request contents of a `SynchronousMessage`.
@@ -1144,7 +1149,7 @@ const char *pactffi_sync_message_get_request_contents(const struct SynchronousMe
  * If the message is NULL, returns 0. If the body of the request
  * is missing, then this function also returns 0.
  */
-size_t pactffi_sync_message_get_request_contents_length(const struct SynchronousMessage *message);
+size_t pactffi_sync_message_get_request_contents_length(const SynchronousMessage *message);
 
 /**
  * Get the request contents of a `SynchronousMessage` as a pointer to an array of bytes.
@@ -1160,7 +1165,7 @@ size_t pactffi_sync_message_get_request_contents_length(const struct Synchronous
  * If the message is NULL, returns NULL. If the body of the message
  * is missing, then this function also returns NULL.
  */
-const unsigned char *pactffi_sync_message_get_request_contents_bin(const struct SynchronousMessage *message);
+const unsigned char *pactffi_sync_message_get_request_contents_bin(const SynchronousMessage *message);
 
 /**
  * Get the number of response messages in the `SynchronousMessage`.
@@ -1173,7 +1178,7 @@ const unsigned char *pactffi_sync_message_get_request_contents_bin(const struct
  *
  * If the message is NULL, returns 0.
  */
-size_t pactffi_sync_message_get_number_responses(const struct SynchronousMessage *message);
+size_t pactffi_sync_message_get_number_responses(const SynchronousMessage *message);
 
 /**
  * Get the response contents of a `SynchronousMessage` in string form.
@@ -1192,7 +1197,7 @@ size_t pactffi_sync_message_get_number_responses(const struct SynchronousMessage
  * This means there's no mechanism to differentiate with this function call alone between
  * a NULL message and a missing message body.
  */
-const char *pactffi_sync_message_get_response_contents(const struct SynchronousMessage *message,
+const char *pactffi_sync_message_get_response_contents(const SynchronousMessage *message,
                                                        size_t index);
 
 /**
@@ -1207,7 +1212,7 @@ const char *pactffi_sync_message_get_response_contents(const struct SynchronousM
  * If the message is NULL or the index is not valid, returns 0. If the body of the request
  * is missing, then this function also returns 0.
  */
-size_t pactffi_sync_message_get_response_contents_length(const struct SynchronousMessage *message,
+size_t pactffi_sync_message_get_response_contents_length(const SynchronousMessage *message,
                                                          size_t index);
 
 /**
@@ -1224,7 +1229,7 @@ size_t pactffi_sync_message_get_response_contents_length(const struct Synchronou
  * If the message is NULL or the index is not valid, returns NULL. If the body of the message
  * is missing, then this function also returns NULL.
  */
-const unsigned char *pactffi_sync_message_get_response_contents_bin(const struct SynchronousMessage *message,
+const unsigned char *pactffi_sync_message_get_response_contents_bin(const SynchronousMessage *message,
                                                                     size_t index);
 
 /**
@@ -1244,7 +1249,7 @@ const unsigned char *pactffi_sync_message_get_response_contents_bin(const struct
  * This function may fail if the Rust string contains embedded
  * null ('\0') bytes.
  */
-const char *pactffi_sync_message_get_description(const struct SynchronousMessage *message);
+const char *pactffi_sync_message_get_description(const SynchronousMessage *message);
 
 /**
  * Write the `description` field on the `SynchronousMessage`.
@@ -1261,8 +1266,7 @@ const char *pactffi_sync_message_get_description(const struct SynchronousMessage
  *
  * Errors will be reported with a non-zero return value.
  */
-int pactffi_sync_message_set_description(struct SynchronousMessage *message,
-                                         const char *description);
+int pactffi_sync_message_set_description(SynchronousMessage *message, const char *description);
 
 /**
  * Get a copy of the provider state at the given index from this message.
@@ -1281,8 +1285,8 @@ int pactffi_sync_message_set_description(struct SynchronousMessage *message,
  * This function may fail if the index requested is out of bounds,
  * or if any of the Rust strings contain embedded null ('\0') bytes.
  */
-const struct ProviderState *pactffi_sync_message_get_provider_state(const struct SynchronousMessage *message,
-                                                                    unsigned int index);
+const ProviderState *pactffi_sync_message_get_provider_state(const SynchronousMessage *message,
+                                                             unsigned int index);
 
 /**
  * Get an iterator over provider states.
@@ -1295,7 +1299,7 @@ const struct ProviderState *pactffi_sync_message_get_provider_state(const struct
  *
  * Returns NULL if an error occurs.
  */
-struct ProviderStateIterator *pactffi_sync_message_get_provider_state_iter(struct SynchronousMessage *message);
+ProviderStateIterator *pactffi_sync_message_get_provider_state_iter(SynchronousMessage *message);
 
 /**
  * Delete a string previously returned by this FFI.
@@ -1342,7 +1346,7 @@ int32_t pactffi_create_mock_server(const char *pact_str,
  *
  * An empty string indicates an error reading the pem file
  */
-char *pactffi_get_tls_ca_certificate(void);
+char *pactffi_get_tls_ca_certificate();
 
 /**
  * External interface to create a mock server. A Pact handle is passed in,
@@ -1442,7 +1446,7 @@ const char *pactffi_mock_server_logs(int32_t mock_server_port);
  *
  * Exported functions are inherently unsafe.
  */
-struct StringResult pactffi_generate_datetime_string(const char *format);
+StringResult pactffi_generate_datetime_string(const char *format);
 
 /**
  * Checks that the example string matches the given regex
@@ -1461,7 +1465,7 @@ bool pactffi_check_regex(const char *regex, const char *example);
  *
  * Exported functions are inherently unsafe.
  */
-struct StringResult pactffi_generate_regex_value(const char *regex);
+StringResult pactffi_generate_regex_value(const char *regex);
 
 /**
  * [DEPRECATED] Frees the memory allocated to a string by another function
@@ -1589,7 +1593,7 @@ bool pactffi_with_query_parameter(InteractionHandle interaction,
  * * `version` - the spec version to use
  */
 bool pactffi_with_specification(PactHandle pact,
-                                enum PactSpecification version);
+                                PactSpecification version);
 
 /**
  * Sets the additional metadata on the Pact file. Common uses are to add the client library details such as the name and version
@@ -1615,7 +1619,7 @@ bool pactffi_with_pact_metadata(PactHandle pact,
  * * `index` - the index of the value (starts at 0). You can use this to create a header with multiple values
  */
 bool pactffi_with_header(InteractionHandle interaction,
-                         enum InteractionPart part,
+                         InteractionPart part,
                          const char *name,
                          size_t index,
                          const char *value);
@@ -1638,7 +1642,7 @@ bool pactffi_response_status(InteractionHandle interaction, unsigned short statu
  * * `body` - The body contents. For JSON payloads, matching rules can be embedded in the body.
  */
 bool pactffi_with_body(InteractionHandle interaction,
-                       enum InteractionPart part,
+                       InteractionPart part,
                        const char *content_type,
                        const char *body);
 
@@ -1654,7 +1658,7 @@ bool pactffi_with_body(InteractionHandle interaction,
  * * `size` - number of bytes in the body
  */
 bool pactffi_with_binary_file(InteractionHandle interaction,
-                              enum InteractionPart part,
+                              InteractionPart part,
                               const char *content_type,
                               const uint8_t *body,
                               size_t size);
@@ -1670,11 +1674,11 @@ bool pactffi_with_binary_file(InteractionHandle interaction,
  * * `file` - path to the example file
  * * `part_name` - name for the mime part
  */
-struct StringResult pactffi_with_multipart_file(InteractionHandle interaction,
-                                                enum InteractionPart part,
-                                                const char *content_type,
-                                                const char *file,
-                                                const char *part_name);
+StringResult pactffi_with_multipart_file(InteractionHandle interaction,
+                                         InteractionPart part,
+                                         const char *content_type,
+                                         const char *file,
+                                         const char *part_name);
 
 /**
  * Get an iterator over all the messages of the Pact. The returned iterator needs to be
@@ -1691,7 +1695,7 @@ struct StringResult pactffi_with_multipart_file(InteractionHandle interaction,
  * This function may fail if any of the Rust strings contain embedded
  * null ('\0') bytes.
  */
-struct PactMessageIterator *pactffi_pact_handle_get_message_iter(PactHandle pact);
+PactMessageIterator *pactffi_pact_handle_get_message_iter(PactHandle pact);
 
 /**
  * Get an iterator over all the synchronous request/response messages of the Pact.
@@ -1708,7 +1712,7 @@ struct PactMessageIterator *pactffi_pact_handle_get_message_iter(PactHandle pact
  * This function may fail if any of the Rust strings contain embedded
  * null ('\0') bytes.
  */
-struct PactSyncMessageIterator *pactffi_pact_handle_get_sync_message_iter(PactHandle pact);
+PactSyncMessageIterator *pactffi_pact_handle_get_sync_message_iter(PactHandle pact);
 
 /**
  * Creates a new Pact Message model and returns a handle to it.
@@ -1913,6 +1917,23 @@ unsigned int pactffi_free_message_pact_handle(MessagePactHandle pact);
  */
 int32_t pactffi_verify(const char *args);
 
+/**
+ * Get a Handle to a newly created verifier. You should call `pactffi_verifier_shutdown` when
+ * done with the verifier to free all allocated resources.
+ *
+ * This function is deprecated. Use `pactffi_verifier_new_for_application` which allows the
+ * calling application/framework name and version to be specified.
+ *
+ * # Safety
+ *
+ * This function is safe.
+ *
+ * # Error Handling
+ *
+ * Returns NULL on error.
+ */
+VerifierHandle *pactffi_verifier_new();
+
 /**
  * Get a Handle to a newly created verifier. You should call `pactffi_verifier_shutdown` when
  * done with the verifier to free all allocated resources
@@ -1925,12 +1946,12 @@ int32_t pactffi_verify(const char *args);
  *
  * Returns NULL on error.
  */
-struct VerifierHandle *pactffi_verifier_new(void);
+VerifierHandle *pactffi_verifier_new_for_application(const char *name, const char *scheme);
 
 /**
  * Shutdown the verifier and release all resources
  */
-void pactffi_verifier_shutdown(struct VerifierHandle *handle);
+void pactffi_verifier_shutdown(VerifierHandle *handle);
 
 /**
  * Set the provider details for the Pact verifier. Passing a NULL for any field will
@@ -1942,7 +1963,7 @@ void pactffi_verifier_shutdown(struct VerifierHandle *handle);
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_set_provider_info(struct VerifierHandle *handle,
+void pactffi_verifier_set_provider_info(VerifierHandle *handle,
                                         const char *name,
                                         const char *scheme,
                                         const char *host,
@@ -1962,7 +1983,7 @@ void pactffi_verifier_set_provider_info(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_set_filter_info(struct VerifierHandle *handle,
+void pactffi_verifier_set_filter_info(VerifierHandle *handle,
                                       const char *filter_description,
                                       const char *filter_state,
                                       unsigned char filter_no_state);
@@ -1979,7 +2000,7 @@ void pactffi_verifier_set_filter_info(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_set_provider_state(struct VerifierHandle *handle,
+void pactffi_verifier_set_provider_state(VerifierHandle *handle,
                                          const char *url,
                                          unsigned char teardown,
                                          unsigned char body);
@@ -1996,7 +2017,7 @@ void pactffi_verifier_set_provider_state(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-int pactffi_verifier_set_verification_options(struct VerifierHandle *handle,
+int pactffi_verifier_set_verification_options(VerifierHandle *handle,
                                               unsigned char publish,
                                               const char *provider_version,
                                               const char *build_url,
@@ -2014,7 +2035,7 @@ int pactffi_verifier_set_verification_options(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_set_consumer_filters(struct VerifierHandle *handle,
+void pactffi_verifier_set_consumer_filters(VerifierHandle *handle,
                                            const char *const *consumer_filters,
                                            unsigned short consumer_filters_len);
 
@@ -2027,7 +2048,7 @@ void pactffi_verifier_set_consumer_filters(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_add_file_source(struct VerifierHandle *handle, const char *file);
+void pactffi_verifier_add_file_source(VerifierHandle *handle, const char *file);
 
 /**
  * Adds a Pact directory as a source to verify. All pacts from the directory that match the
@@ -2039,7 +2060,7 @@ void pactffi_verifier_add_file_source(struct VerifierHandle *handle, const char
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_add_directory_source(struct VerifierHandle *handle, const char *directory);
+void pactffi_verifier_add_directory_source(VerifierHandle *handle, const char *directory);
 
 /**
  * Adds a URL as a source to verify. The Pact file will be fetched from the URL.
@@ -2053,7 +2074,7 @@ void pactffi_verifier_add_directory_source(struct VerifierHandle *handle, const
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_url_source(struct VerifierHandle *handle,
+void pactffi_verifier_url_source(VerifierHandle *handle,
                                  const char *url,
                                  const char *username,
                                  const char *password,
@@ -2072,7 +2093,7 @@ void pactffi_verifier_url_source(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_broker_source(struct VerifierHandle *handle,
+void pactffi_verifier_broker_source(VerifierHandle *handle,
                                     const char *url,
                                     const char *provider_name,
                                     const char *username,
@@ -2100,7 +2121,7 @@ void pactffi_verifier_broker_source(struct VerifierHandle *handle,
  * will be replaced with U+FFFD REPLACEMENT CHARACTER.
  *
  */
-void pactffi_verifier_broker_source_with_selectors(struct VerifierHandle *handle,
+void pactffi_verifier_broker_source_with_selectors(VerifierHandle *handle,
                                                    const char *url,
                                                    const char *provider_name,
                                                    const char *username,
@@ -2123,7 +2144,7 @@ void pactffi_verifier_broker_source_with_selectors(struct VerifierHandle *handle
  *
  * Errors will be reported with a non-zero return value.
  */
-int pactffi_verifier_execute(struct VerifierHandle *handle);
+int pactffi_verifier_execute(VerifierHandle *handle);
 
 /**
  * External interface to retrieve the options and arguments available when calling the CLI interface,
@@ -2174,7 +2195,7 @@ int pactffi_verifier_execute(struct VerifierHandle *handle);
  *
  * Exported functions are inherently unsafe.
  */
-const char *pactffi_verifier_cli_args(void);
+const char *pactffi_verifier_cli_args();
 
 /**
  * Extracts the logs for the verification run. This needs the memory buffer log sink to be
@@ -2183,7 +2204,7 @@ const char *pactffi_verifier_cli_args(void);
  *
  * Will return a NULL pointer if the logs for the verification can not be retrieved.
  */
-const char *pactffi_verifier_logs(const struct VerifierHandle *handle);
+const char *pactffi_verifier_logs(const VerifierHandle *handle);
 
 /**
  * Extracts the logs for the verification run for the provider name. This needs the memory
@@ -2257,8 +2278,10 @@ void pactffi_cleanup_plugins(PactHandle pact);
  * When an error errors, LAST_ERROR will contain the error message.
  */
 unsigned int pactffi_interaction_contents(InteractionHandle interaction,
-                                          enum InteractionPart part,
+                                          InteractionPart part,
                                           const char *content_type,
                                           const char *contents);
 
-#endif /* pact_ffi_h */
+} // extern "C"
+
+#endif // pact_ffi_h