Minor renames; tests not yet compiling

Author: bartelink

equinox-fc/Domain.Tests/LocationEpochTests.fs

@@ -7,8 +7,8 @@ open Swensen.Unquote
 let interpret transactionId delta _balance =
     match delta with
     | 0 -> (), []
-    | delta when delta < 0 -> (), [Events.Removed { delta = -delta; transaction = transactionId }]
-    | delta -> (), [Events.Added { delta = delta; transaction = transactionId }]
+    | delta when delta < 0 -> (), [Events.Removed {| delta = -delta; id = transactionId |}]
+    | delta -> (), [Events.Added {| delta = delta; id = transactionId |}]
 
 let validateAndInterpret transactionId expectedBalance delta balance =
     test <@ expectedBalance = balance @>
@@ -28,7 +28,7 @@ let [<Property>] properties transactionId carriedForward delta1 closeImmediately
     let cfEvents events = events |> List.filter (function Events.CarriedForward _ -> true | _ -> false)
     let closeEvents events = events |> List.filter (function Events.Closed -> true | _ -> false)
     let state1 = Fold.fold Fold.initial events
-    let expectedBalance = carriedForward + delta1
+    let expectedBalance = carriedForward.initial + delta1
     // Only expect closing if it was requested
     let expectImmediateClose = closeImmediately
     test <@ Option.isSome res.result

equinox-fc/Domain.Tests/LocationTests.fs

@@ -38,8 +38,8 @@ let run (service : Location.Service) (IdsAtLeastOne locations, deltas : _[], tra
     let adjust delta (bal : Epoch.Fold.Balance) =
         let value = max -bal delta
         if value = 0 then 0, []
-        elif value < 0 then value, [Epoch.Events.Removed { delta = -value; transaction = transactionId }]
-        else value, [Epoch.Events.Added { delta = value; transaction = transactionId }]
+        elif value < 0 then value, [Epoch.Events.Removed {| delta = -value; id = transactionId |}]
+        else value, [Epoch.Events.Added {| delta = value; id = transactionId |}]
     let! appliedDeltas = seq { for loc, x in updates -> async { let! _, eff = service.Execute(loc, adjust x) in return loc,eff } } |> Async.Parallel
     let expectedBalances = Seq.append (seq { for l in locations -> l, 0}) appliedDeltas |> Seq.groupBy fst |> Seq.map (fun (l, xs) -> l, xs |> Seq.sumBy snd) |> Set.ofSeq