FsCodec 3.0.0-rc.10 + Fix test timing

jet · Jun 5, 2023 · e609c90 · e609c90
1 parent d3aea5b
commit e609c90
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/samples/Store/Domain/Domain.fsproj b/samples/Store/Domain/Domain.fsproj
@@ -17,8 +17,8 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.9.6" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.10" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.10" />
 
     <ProjectReference Include="..\..\..\src\Equinox\Equinox.fsproj" />
   </ItemGroup>

diff --git a/samples/Tutorial/Tutorial.fsproj b/samples/Tutorial/Tutorial.fsproj
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.9.6" />
-    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec.NewtonsoftJson" Version="3.0.0-rc.10" />
+    <PackageReference Include="FsCodec.SystemTextJson" Version="3.0.0-rc.10" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="5.2.0" />
   </ItemGroup>

diff --git a/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj b/src/Equinox.CosmosStore/Equinox.CosmosStore.fsproj
@@ -20,7 +20,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.30.1" />
     <PackageReference Include="System.Text.Json" Version="6.0.1" />

diff --git a/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj b/src/Equinox.DynamoStore/Equinox.DynamoStore.fsproj
@@ -19,7 +19,7 @@
       <ExcludeAssets>contentFiles</ExcludeAssets>
     </PackageReference>
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.AWS.DynamoDB" Version="0.11.2-beta" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>

diff --git a/src/Equinox.EventStore/Equinox.EventStore.fsproj b/src/Equinox.EventStore/Equinox.EventStore.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
     <PackageReference Include="EventStore.Client" Version="22.0.0-preview" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>
 

diff --git a/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj b/src/Equinox.EventStoreDb/Equinox.EventStoreDb.fsproj
@@ -20,7 +20,7 @@
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
     <PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
   </ItemGroup>
 

diff --git a/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj b/src/Equinox.MemoryStore/Equinox.MemoryStore.fsproj
@@ -17,7 +17,7 @@
     <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Equinox.MessageDb/Equinox.MessageDb.fsproj b/src/Equinox.MessageDb/Equinox.MessageDb.fsproj
@@ -25,7 +25,7 @@
     <ItemGroup>
         <PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="All" />
         <PackageReference Include="FSharp.Core" Version="6.0.7" />
-        <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+        <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
         <PackageReference Include="Npgsql" Version="7.0.0" />
     </ItemGroup>
 

diff --git a/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj b/src/Equinox.SqlStreamStore/Equinox.SqlStreamStore.fsproj
@@ -19,7 +19,7 @@
 
     <PackageReference Include="FSharp.Core" Version="6.0.7" />
 
-    <PackageReference Include="FsCodec" Version="3.0.0-rc.9.6" />
+    <PackageReference Include="FsCodec" Version="3.0.0-rc.10" />
     <PackageReference Include="FSharp.Control.TaskSeq" Version="0.3.0" />
     <PackageReference Include="SqlStreamStore" Version="1.2.0-beta.8" />
   </ItemGroup>

diff --git a/tests/Equinox.Core.Tests/CachingTests.fs b/tests/Equinox.Core.Tests/CachingTests.fs
@@ -159,14 +159,14 @@ type Tests() =
 
         let! struct (_token, state) = loadReadThrough 1000 // Existing cached entry is used, as fresh enough
         test <@ (1, 1, 0) = (state, cat.Loads, cat.Reloads) @>
-        do! Task.Delay 100
+        do! Task.Delay 50
         let! struct (_token, state) = loadReadThrough 1000 // Does not load, or extend lifetime
         test <@ (1, 1, 0) = (state, cat.Loads, cat.Reloads) @>
-        let! struct (_token, state) = loadReadThrough 50 // Triggers reload as delay of 100 above has rendered entry stale
+        let! struct (_token, state) = loadReadThrough 10 // Should trigger reload as delay of 50 above has rendered entry stale
         test <@ (2, 1, 1) = (state, cat.Loads, cat.Reloads) @>
         cat.Delay <- TimeSpan.FromMilliseconds 50
         let t3 = requireLoad ()
-        do! Task.Delay 10 // Make the main read enter a delay state (of 50); ensure readThrough values are expired
+        do! Task.Delay 10 // ensure the main (t3) read enters the delay state (of 50); ensure readThrough values are expired
         cat.Delay <- TimeSpan.FromMilliseconds 75 // Next read picks up the longer delay
         // These reads start after the first read so replace the older value in the cache
         let t1 = loadReadThrough 1