Jacob-Steentoft · Oct 27, 2026 · Oct 26, 2026 · Oct 26, 2026 · Oct 27, 2026
diff --git a/src/Mocha/src/Mocha.Transport.Nats/Descriptors/INatsReceiveEndpointDescriptor.cs b/src/Mocha/src/Mocha.Transport.Nats/Descriptors/INatsReceiveEndpointDescriptor.cs
@@ -1,4 +1,3 @@
-using Mocha.Middlewares;
 using NATS.Client.JetStream.Models;
 
 namespace Mocha.Transport.Nats;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Descriptors/NatsReceiveEndpointDescriptor.cs b/src/Mocha/src/Mocha.Transport.Nats/Descriptors/NatsReceiveEndpointDescriptor.cs
@@ -1,5 +1,4 @@
 using Mocha.Features;
-using Mocha.Middlewares;
 using NATS.Client.JetStream.Models;
 
 namespace Mocha.Transport.Nats;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsAcknowledgementMiddleware.cs b/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsAcknowledgementMiddleware.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Mocha.Features;
 using Mocha.Middlewares;
 using Mocha.Transport.Nats.Features;
 using NATS.Client.JetStream;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsParsingMiddleware.cs b/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsParsingMiddleware.cs
@@ -1,4 +1,3 @@
-using Mocha.Features;
 using Mocha.Middlewares;
 using Mocha.Transport.Nats.Features;
 

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsReceiveMiddlewares.cs b/src/Mocha/src/Mocha.Transport.Nats/Middlewares/Receive/NatsReceiveMiddlewares.cs
@@ -1,4 +1,3 @@
-using Mocha.Middlewares;
 
 namespace Mocha.Transport.Nats.Middlewares;
 

diff --git a/src/Mocha/src/Mocha.Transport.Nats/NatsDispatchEndpoint.cs b/src/Mocha/src/Mocha.Transport.Nats/NatsDispatchEndpoint.cs
@@ -1,7 +1,6 @@
 using System.Globalization;
 using Mocha.Middlewares;
 using NATS.Client.Core;
-using NATS.Client.JetStream;
 using NATS.Client.JetStream.Models;
 
 namespace Mocha.Transport.Nats;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/NatsReceiveEndpoint.cs b/src/Mocha/src/Mocha.Transport.Nats/NatsReceiveEndpoint.cs
@@ -1,7 +1,6 @@
 using System.Threading.Channels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Mocha.Features;
 using Mocha.Transport.Nats.Features;
 using NATS.Client.Core;
 using NATS.Client.JetStream;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Topology/Extensions/NatsTransportDescriptorExtensions.cs b/src/Mocha/src/Mocha.Transport.Nats/Topology/Extensions/NatsTransportDescriptorExtensions.cs
@@ -1,4 +1,3 @@
-using Mocha.Middlewares;
 using Mocha.Transport.Nats.Middlewares;
 
 namespace Mocha.Transport.Nats;

diff --git a/src/Mocha/src/Mocha.Transport.Nats/Topology/NatsRoutingStrategy.cs b/src/Mocha/src/Mocha.Transport.Nats/Topology/NatsRoutingStrategy.cs
@@ -230,7 +230,7 @@ public override void DiscoverTopology(
         DispatchEndpoint endpoint,
         DispatchEndpointConfiguration configuration)
     {
-        if (configuration is not NatsDispatchEndpointConfiguration { Subject: { } subject } natsConfiguration)
+        if (configuration is not NatsDispatchEndpointConfiguration { Subject: { } subject })
         {
             return;
         }

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/AckProgressTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/AckProgressTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/BatchingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/BatchingTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ConcurrencyLimiterTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ConcurrencyLimiterTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ConcurrencyTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ConcurrencyTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/CustomHeaderTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/CustomHeaderTests.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredConsumerTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredConsumerTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredStreamConflictTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredStreamConflictTests.cs
@@ -4,7 +4,6 @@
 using Mocha.Narrow.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredStreamRebootTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/DeclaredStreamRebootTests.cs
@@ -3,7 +3,6 @@
 using Mocha.Reboot.Contracts;
 using Mocha.Transport.Nats.Tests.Helpers;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ExpiryTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ExpiryTests.cs
@@ -3,7 +3,6 @@
 using Mocha.Expiry.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ExplicitBindingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ExplicitBindingTests.cs
@@ -2,7 +2,6 @@
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultEndpointTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultEndpointTests.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Hosting;
 using Mocha.Faults.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultHandlingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultHandlingTests.cs
@@ -5,7 +5,6 @@
 using Mocha.Transport.Nats.Tests.Helpers;
 using NATS.Client.JetStream;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultSubjectScopingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/FaultSubjectScopingTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/InboxTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/InboxTests.cs
@@ -1,11 +1,9 @@
 using System.Collections.Concurrent;
 using Microsoft.Extensions.DependencyInjection;
-using Mocha.Features;
 using Mocha.Inbox;
 using Mocha.Middlewares;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/MiddlewareTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/MiddlewareTests.cs
@@ -1,9 +1,7 @@
 using System.Collections.Concurrent;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Mocha.Middlewares;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PolymorphicFunnelTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PolymorphicFunnelTests.cs
@@ -3,7 +3,6 @@
 using Mocha.Polymorphic.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PublishDeduplicationTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PublishDeduplicationTests.cs
@@ -1,8 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
-using Mocha.Middlewares;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PublishSubscribeTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/PublishSubscribeTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/RedeliveryTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/RedeliveryTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SagaTimeoutScopingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SagaTimeoutScopingTests.cs
@@ -4,7 +4,6 @@
 using Mocha.Sagas;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Timeouts.Contracts;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SchedulingTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SchedulingTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Transport.Nats.Tests.Helpers;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SendTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SendTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ServiceShapeTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/ServiceShapeTests.cs
@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Hosting;
 using Mocha.Shape.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SharedStreamTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/SharedStreamTests.cs
@@ -5,7 +5,6 @@
 using Mocha.Shared.Contracts;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/StreamSubjectRetentionTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/StreamSubjectRetentionTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/WildcardFunnelTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Behaviors/WildcardFunnelTests.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
 using Mocha.Wildcard.Commands;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests.Behaviors;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/CompetingConsumerTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/CompetingConsumerTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/DeadLetterTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/DeadLetterTests.cs
@@ -3,7 +3,6 @@
 using Mocha.Transport.Nats.Tests.Fixtures;
 using NATS.Client.JetStream;
 using NATS.Client.JetStream.Models;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/EndToEndTests.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/EndToEndTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Mocha.Transport.Nats.Tests.Fixtures;
-using Xunit;
 
 namespace Mocha.Transport.Nats.Tests;
 

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamFixture.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamFixture.cs
@@ -1,7 +1,7 @@
+using CookieCrumble.Resources;
 using NATS.Client.Core;
 using NATS.Client.JetStream;
-using Squadron;
-using Xunit;
+using Testcontainers.Nats;
 
 namespace Mocha.Transport.Nats.Tests.Fixtures;
 
@@ -10,7 +10,12 @@ namespace Mocha.Transport.Nats.Tests.Fixtures;
 /// </summary>
 public sealed partial class JetStreamFixture : IAsyncLifetime
 {
-    private readonly NatsResource<JetStreamOptions> _resource = new();
+    /// <summary>
+    /// The NATS server image: the lowest version with per-message TTL (2.11) and message schedules (2.12).
+    /// </summary>
+    public const string Image = "nats:2.12-alpine";
+
+    private readonly JetStreamResource _resource = new();
 
     private NatsConnection? _connection;
 
@@ -56,6 +61,11 @@ public async ValueTask DisposeAsync()
 
         await _resource.DisposeAsync();
     }
+
+    private sealed class JetStreamResource : NatsResource
+    {
+        protected override NatsBuilder Configure(NatsBuilder builder) => builder.WithImage(Image);
+    }
 }
 
 /// <summary>

diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamOptions.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamOptions.cs
diff --git a/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamScope.cs b/src/Mocha/test/Mocha.Transport.Nats.Tests/Fixtures/JetStreamScope.cs
@@ -11,7 +11,7 @@ namespace Mocha.Transport.Nats.Tests.Fixtures;
 /// <remarks>
 /// NATS has no equivalent of a RabbitMQ vhost or a Postgres database, so isolation is achieved by
 /// removing every stream the server holds. Two things make that necessary rather than tidy: a new
-/// durable defaults to <see cref="ConsumerConfigDeliverPolicy.All"/> and so replays whatever an
+/// durable defaults to <see cref="NATS.Client.JetStream.Models.ConsumerConfigDeliverPolicy.All"/> and so replays whatever an
 /// earlier test left behind, and a convention stream binds to any stream that already captures its
 /// subjects, so one test's stream silently becomes the next test's.
 /// </remarks>
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,3 @@
		using Mocha.Middlewares;

		namespace Mocha.Transport.Nats.Middlewares;

Expand Down