SQLStreamStore · damianh · May 21, 2018 · May 20, 2018 · May 20, 2018
diff --git a/src/SqlStreamStore.AcceptanceTests/SqlStreamStoreAcceptanceTests.StreamMetadata.cs b/src/SqlStreamStore.AcceptanceTests/SqlStreamStoreAcceptanceTests.StreamMetadata.cs
@@ -300,5 +300,26 @@ await store
                }
            }
        }
+
+        [Fact]
+        public async Task Can_set_deleted_stream_metadata()
+        {
+            using (var fixture = GetFixture())
+            {
+                using (var store = await fixture.GetStreamStore())
+                {
+                    const string streamId = Deleted.DeletedStreamId;
+                    await store
+                        .SetStreamMetadata(streamId, maxCount: 2, maxAge: 30);
+
+                    var metadata = await store.GetStreamMetadata(streamId);
+
+                    metadata.MetadataStreamVersion.ShouldBe(0);
+                    metadata.MaxAge.ShouldBe(30);
+                    metadata.MaxCount.ShouldBe(2);
+                    metadata.MetadataJson.ShouldBeNull();
+                }
+            }
+        }
    }
 }
diff --git a/src/SqlStreamStore/Infrastructure/ReadonlyStreamStoreBase.cs b/src/SqlStreamStore/Infrastructure/ReadonlyStreamStoreBase.cs
@@ -208,7 +208,11 @@ public Task<StreamMetadataResult> GetStreamMetadata(
           string streamId,
           CancellationToken cancellationToken = default)
        {
-            Ensure.That(streamId, nameof(streamId)).IsNotNullOrWhiteSpace().DoesNotStartWith("$");
+            if (streamId == null) throw new ArgumentNullException(nameof(streamId));
+            if (streamId.StartsWith("$") && streamId != Deleted.DeletedStreamId)
+            {
+                throw new ArgumentException("Must not start with '$'", nameof(streamId));
+            }

            if (Logger.IsDebugEnabled())
            {

diff --git a/src/SqlStreamStore/Infrastructure/StreamStoreBase.cs b/src/SqlStreamStore/Infrastructure/StreamStoreBase.cs
@@ -98,7 +98,12 @@ public Task SetStreamMetadata(
            string metadataJson = null,
            CancellationToken cancellationToken = default)
        {
-            Ensure.That(streamId.Value, nameof(streamId)).DoesNotStartWith("$");
+            if(streamId == null) throw new ArgumentNullException(nameof(streamId));
+            if(streamId.Value.StartsWith("$") && streamId.Value != Deleted.DeletedStreamId)
+            {
+                throw new ArgumentException("Must not start with '$'", nameof(streamId));
+            }
+
            Ensure.That(expectedStreamMetadataVersion, nameof(expectedStreamMetadataVersion)).IsGte(-2);

            if (Logger.IsDebugEnabled())