refactor(ffi-interop): reorganize remaining interop methods and change visibility to internal

Author: max-lancaster

src/PactNet.Extensions.Grpc/GrpcExtensions.cs

@@ -27,8 +27,8 @@ public static IGrpcPactBuilderV4 WithGrpcInteractions(this IPactV4 pact, int? po
 
     private static PactHandle NewGrpcPact(string consumerName, string providerName)
     {
-        PactHandle pact = NativeInterop.NewPact(consumerName, providerName);
-        NativeInterop.WithSpecification(pact, PactSpecification.V4).ThrowExceptionOnFailure();
+        PactHandle pact = PactInterop.NewPact(consumerName, providerName);
+        PactInterop.WithSpecification(pact, PactSpecification.V4).ThrowExceptionOnFailure();
         return pact;
     }
 }

src/PactNet.Extensions.Grpc/GrpcPactBuilder.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Text.Json;
 using System.Threading.Tasks;
-using PactNet.Drivers;
 using PactNet.Exceptions;
 using PactNet.Interop;
+using PactNet.Interop.Drivers;
 using PactNet.Models;
 
 namespace PactNet.Extensions.Grpc;
@@ -91,7 +91,7 @@ public void Verify(Action<IConsumerContext> interact)
         }
         finally
         {
-            this.PrintLogs(mockServer);
+            this.PrintLogs();
         }
     }
 
@@ -119,7 +119,7 @@ public async Task VerifyAsync(Func<IConsumerContext, Task> interact)
         }
         finally
         {
-            this.PrintLogs(mockServer);
+            this.PrintLogs();
         }
     }
 
@@ -165,10 +165,9 @@ private void VerifyInternal(IMockServerDriver mockServer)
     /// <summary>
     /// Print logs to the configured outputs
     /// </summary>
-    /// <param name="mockServer">Mock server</param>
-    private void PrintLogs(IMockServerDriver mockServer)
+    private void PrintLogs()
     {
-        string logs = NativeInterop.FetchLogBuffer(null);
+        string logs = LoggingInterop.FetchLogBuffer(null);
 
         this.config.WriteLine("Mock driver logs:");
         this.config.WriteLine(string.Empty);

src/PactNet.Extensions.Grpc/GrpcRequestBuilder.cs

@@ -58,7 +58,7 @@ internal class GrpcRequestBuilder(InteractionHandle interaction) : IGrpcRequestB
     /// <returns>Fluent builder</returns>
     public IGrpcRequestBuilderV4 Given(string providerState)
     {
-        NativeInterop.Given(interaction, providerState).ThrowExceptionOnFailure();
+        PactInterop.Given(interaction, providerState).ThrowExceptionOnFailure();
         return this;
     }
 
@@ -72,7 +72,7 @@ public IGrpcRequestBuilderV4 Given(string providerState, IDictionary<string, str
     {
         foreach (var param in parameters)
         {
-            NativeInterop.GivenWithParam(interaction, providerState, param.Key, param.Value).ThrowExceptionOnFailure();
+            PactInterop.GivenWithParam(interaction, providerState, param.Key, param.Value).ThrowExceptionOnFailure();
         }
 
         return this;

src/PactNet.Interop/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet.Extensions.Grpc")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("PactNet.Extensions.Grpc.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")]

src/PactNet.Abstractions/Drivers/IMockServerDriver.cs renamed to src/PactNet.Interop/Drivers/IMockServerDriver.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace PactNet.Drivers
+namespace PactNet.Interop.Drivers
 {
     /// <summary>
     /// Driver for managing a HTTP mock server
     /// </summary>
-    public interface IMockServerDriver : IDisposable
+    internal interface IMockServerDriver : IDisposable
     {
         /// <summary>
         /// Mock server URI

src/PactNet.Abstractions/Drivers/IPluginDriver.cs renamed to src/PactNet.Interop/Drivers/IPluginDriver.cs

@@ -1,9 +1,8 @@
 using System;
-using PactNet.Interop;
 
-namespace PactNet.Drivers;
+namespace PactNet.Interop.Drivers;
 
-public interface IPluginDriver : IDisposable
+internal interface IPluginDriver : IDisposable
 {
     /// <summary>
     /// Add interaction contents for a plugin interaction.

src/PactNet.Interop/MockServerDriver.cs renamed to src/PactNet.Interop/Drivers/MockServerDriver.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
-using PactNet.Drivers;
 
-namespace PactNet.Interop
+namespace PactNet.Interop.Drivers
 {
     /// <summary>
     /// Driver for managing a HTTP mock server
@@ -37,7 +36,7 @@ internal MockServerDriver(string host, int port, bool tls)
         /// </summary>
         public bool MockServerMatched()
         {
-            return MockServerInterop.MockServerMatched(Port);
+            return MockServerInterop.MockServerMatched(this.Port);
         }
 
         /// <summary>

src/PactNet.Interop/PluginDriver.cs renamed to src/PactNet.Interop/Drivers/PluginDriver.cs

@@ -1,7 +1,6 @@
 using System;
-using PactNet.Drivers;
 
-namespace PactNet.Interop;
+namespace PactNet.Interop.Drivers;
 
 internal class PluginDriver(PactHandle pact) : IPluginDriver
 {

src/PactNet.Abstractions/Interop/InteractionHandle.cs renamed to src/PactNet.Interop/InteractionHandle.cs

@@ -3,7 +3,7 @@
 namespace PactNet.Interop
 {
     [StructLayout(LayoutKind.Sequential)]
-    public readonly struct InteractionHandle
+    internal readonly struct InteractionHandle
     {
         public readonly uint InteractionRef;
     }

src/PactNet.Abstractions/Interop/InteractionPart.cs renamed to src/PactNet.Interop/InteractionPart.cs

@@ -1,6 +1,6 @@
 namespace PactNet.Interop
 {
-    public enum InteractionPart
+    internal enum InteractionPart
     {
         Request = 0,
         Response = 1