local crdts & fixed tests

src/Akka.sln

@@ -245,6 +245,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Streams.Tests.TCK", "core\Akka.Streams.Tests.TCK\Akka.Streams.Tests.TCK.csproj", "{805908F6-8792-47C0-8E4F-4DB4C5736A47}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Cluster.Sharding.Tests.MultiNode", "contrib\cluster\Akka.Cluster.Sharding.Tests.MultiNode\Akka.Cluster.Sharding.Tests.MultiNode.csproj", "{F79A5E87-1DB5-4D76-9B14-382F8C536DA6}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.DistributedData", "contrib\cluster\Akka.DistributedData\Akka.DistributedData.csproj", "{59CFFC88-8A73-445D-B191-281E40BE9421}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.DistributedData.Tests", "contrib\cluster\Akka.DistributedData.Tests\Akka.DistributedData.Tests.csproj", "{0DBF3D66-6E5E-4A89-AA3D-674B92FE81B7}"

src/SharedAssemblyInfo.cs

@@ -1,16 +1,8 @@
-//-----------------------------------------------------------------------
-// <copyright file="SharedAssemblyInfo.cs" company="Akka.NET Project">
-//     Copyright (C) 2009-2016 Lightbend Inc. <http://www.lightbend.com>
-//     Copyright (C) 2013-2016 Akka.NET project <https://github.com/akkadotnet/akka.net>
-// </copyright>
-//-----------------------------------------------------------------------
-
-// <auto-generated/>
+// <auto-generated/>
 using System.Reflection;
 
 [assembly: AssemblyCompanyAttribute("Akka.NET Team")]
 [assembly: AssemblyCopyrightAttribute("Copyright © 2013-2016 Akka.NET Team")]
 [assembly: AssemblyTrademarkAttribute("")]
 [assembly: AssemblyVersionAttribute("1.1.2.0")]
 [assembly: AssemblyFileVersionAttribute("1.1.2.0")]
-

src/contrib/cluster/Akka.DistributedData.Tests/FlagSpec.cs

@@ -10,6 +10,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class FlagSpec
     {
         public FlagSpec(ITestOutputHelper output)

src/contrib/cluster/Akka.DistributedData.Tests/GCounterSpec.cs

@@ -7,11 +7,13 @@
 
 using Akka.Cluster;
 using System.Numerics;
+using Akka.Actor;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class GCounterSpec
     {
         private readonly UniqueAddress _node1 = new UniqueAddress(new Actor.Address("akka.tcp", "Sys", "localhost", 2551), 1);

src/contrib/cluster/Akka.DistributedData.Tests/GSetSpec.cs

@@ -10,6 +10,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class GSetSpec
     {
         const string user1 = "{\"username\":\"john\",\"password\":\"coltrane\"}";

src/contrib/cluster/Akka.DistributedData.Tests/LWWDictionarySpec.cs

@@ -15,6 +15,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class LWWDictionarySpec
     {
         private readonly UniqueAddress _node1;

src/contrib/cluster/Akka.DistributedData.Tests/LWWRegisterSpec.cs

@@ -14,6 +14,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class LWWRegisterSpec
     {
         private readonly UniqueAddress _node1;

src/contrib/cluster/Akka.DistributedData.Tests/LocalConcurrencySpec.cs

@@ -13,6 +13,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class LocalConcurrencySpec : Akka.TestKit.Xunit2.TestKit
     {
         public sealed class Updater : ReceiveActor, IWithUnboundedStash

src/contrib/cluster/Akka.DistributedData.Tests/ORDictionarySpec.cs

@@ -14,6 +14,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class ORDictionarySpec
     {
         private readonly UniqueAddress _node1;

src/contrib/cluster/Akka.DistributedData.Tests/ORMultiDictionarySpec.cs

@@ -14,6 +14,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class ORMultiDictionarySpec
     {
         private readonly UniqueAddress _node1;
@@ -139,7 +140,7 @@ public void A_ORMultiDictionary_should_be_able_to_get_all_bindings_for_an_entry_
             m.TryGetValue("a", out a);
             Assert.Equal(ImmutableHashSet.Create("A1", "A2"), a);
 
-            var m2 = m.SetItem(_node1, "a", a.Remove("A1"));
+            var m2 = m.SetItems(_node1, "a", a.Remove("A1"));
             Assert.Equal(ImmutableDictionary.CreateRange(new[]
             {
                 new KeyValuePair<string, IImmutableSet<string>>("a", ImmutableHashSet.Create("A2")),

src/contrib/cluster/Akka.DistributedData.Tests/ORSetSpec.cs

@@ -12,6 +12,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class ORSetSpec
     {
         private readonly string _user1 = "{\"username\":\"john\",\"password\":\"coltrane\"}";

src/contrib/cluster/Akka.DistributedData.Tests/PNCounterDictionarySpec.cs

@@ -14,6 +14,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class PNCounterDictionarySpec
     {
         readonly UniqueAddress _node1;

src/contrib/cluster/Akka.DistributedData.Tests/PNCounterSpec.cs

@@ -11,6 +11,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class PNCounterSpec
     {
         readonly UniqueAddress _address1;

src/contrib/cluster/Akka.DistributedData.Tests/PruningStateSpec.cs

@@ -12,6 +12,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class PruningStateSpec
     {
         private readonly UniqueAddress _node1 = new UniqueAddress(new Address("akka.tcp", "Sys", "localhost", 2551), 1);

src/contrib/cluster/Akka.DistributedData.Tests/Serialization/ReplicatedDataSerializerSpec.cs

@@ -5,6 +5,9 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
+using System;
+using System.Collections;
+using System.Linq;
 using System.Collections.Immutable;
 using Akka.Actor;
 using Akka.Cluster;
@@ -15,6 +18,7 @@
 
 namespace Akka.DistributedData.Tests.Serialization
 {
+    [Collection("DistributedDataSpec")]
     public class ReplicatedDataSerializerSpec : TestKit.Xunit2.TestKit
     {
         private static readonly Config BaseConfig = ConfigurationFactory.ParseString(@"
@@ -159,11 +163,11 @@ public void ReplicatedDataSerializer_should_serialize_ORMultiDictionary()
             CheckSerialization(ORMultiDictionary<string, string>.Empty.AddItem(_address1, "a", "A"));
             CheckSerialization(ORMultiDictionary<string, string>.Empty
                 .AddItem(_address1, "a", "A1")
-                .SetItem(_address2, "b", ImmutableHashSet.CreateRange(new[] { "B1", "B2", "B3" }))
+                .SetItems(_address2, "b", ImmutableHashSet.CreateRange(new[] { "B1", "B2", "B3" }))
                 .AddItem(_address2, "a", "A2"));
 
             var m1 = ORMultiDictionary<string, string>.Empty.AddItem(_address1, "a", "A1").AddItem(_address2, "a", "A2");
-            var m2 = ORMultiDictionary<string, string>.Empty.SetItem(_address2, "b", ImmutableHashSet.CreateRange(new[] { "B1", "B2", "B3" }));
+            var m2 = ORMultiDictionary<string, string>.Empty.SetItems(_address2, "b", ImmutableHashSet.CreateRange(new[] { "B1", "B2", "B3" }));
             CheckSameContent(m1.Merge(m2), m2.Merge(m1));
         }
 
@@ -185,18 +189,24 @@ public void ReplicatedDataSerializer_should_serialize_VersionVector()
             CheckSameContent(v1.Merge(v2), v2.Merge(v1));
         }
 
-        private void CheckSerialization(object expected)
+        private void CheckSerialization<T>(T expected)
         {
             var serializer = Sys.Serialization.FindSerializerFor(expected);
             var blob = serializer.ToBinary(expected);
             var actual = serializer.FromBinary(blob, expected.GetType());
-
-            Assert.Equal(expected, actual);
+
+            // we cannot use Assert.Equal here since ORMultiDictionary will be resolved as
+            // IEnumerable<KeyValuePair<string, ImmutableHashSet<string>> and immutable sets
+            // fails on structural equality
+            Assert.True(expected.Equals(actual));
         }
 
         private void CheckSameContent(object a, object b)
         {
-            Assert.Equal(a, b);
+            // we cannot use Assert.Equal here since ORMultiDictionary will be resolved as
+            // IEnumerable<KeyValuePair<string, ImmutableHashSet<string>> and immutable sets
+            // fails on structural equality
+            Assert.True(a.Equals(b));
             var serializer = Sys.Serialization.FindSerializerFor(a);
             var blobA = serializer.ToBinary(a);
             var blobB = serializer.ToBinary(b);

src/contrib/cluster/Akka.DistributedData.Tests/Serialization/ReplicatorMessageSerializerSpec.cs

@@ -19,6 +19,7 @@
 
 namespace Akka.DistributedData.Tests.Serialization
 {
+    [Collection("DistributedDataSpec")]
     public class ReplicatorMessageSerializerSpec : TestKit.Xunit2.TestKit
     {
         private static readonly Config BaseConfig = ConfigurationFactory.ParseString(@"

src/contrib/cluster/Akka.DistributedData.Tests/VersionVectorSpec.cs

@@ -12,6 +12,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class VersionVectorSpec
     {
         private readonly UniqueAddress _node1 = new UniqueAddress(new Address("akka.tcp", "Sys", "localhost", 2551), 1);

src/contrib/cluster/Akka.DistributedData.Tests/WriteAggregatorSpec.cs

@@ -17,6 +17,7 @@
 
 namespace Akka.DistributedData.Tests
 {
+    [Collection("DistributedDataSpec")]
     public class WriteAggregatorSpec : Akka.TestKit.Xunit2.TestKit
     {
         internal class TestWriteAggregator : WriteAggregator

src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj

@@ -54,6 +54,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Local\ClusterReplicatedDataExtensions.cs" />
     <Compile Include="DistributedData.cs" />
     <Compile Include="Dsl.cs" />
     <Compile Include="FastMerge.cs" />
@@ -63,6 +64,13 @@
     <Compile Include="Internal\Internal.cs" />
     <Compile Include="IReplicatedDataSerialization.cs" />
     <Compile Include="Key.cs" />
+    <Compile Include="Local\LocalLWWDictionary.cs" />
+    <Compile Include="Local\LocalLWWRegister.cs" />
+    <Compile Include="Local\LocalORDictionary.cs" />
+    <Compile Include="Local\LocalORMultiDictionary.cs" />
+    <Compile Include="Local\LocalORSet.cs" />
+    <Compile Include="Local\LocalPNCounter.cs" />
+    <Compile Include="Local\LocalPNCounterDictionary.cs" />
     <Compile Include="LWWDictionary.cs" />
     <Compile Include="LWWRegister.cs" />
     <Compile Include="ORDictionary.cs" />
@@ -78,6 +86,7 @@
     <Compile Include="Replicator.cs" />
     <Compile Include="Replicator.Messages.cs" />
     <Compile Include="ReplicatorSettings.cs" />
+    <Compile Include="Local\LocalGCounter.cs" />
     <Compile Include="VersionVector.cs" />
     <Compile Include="WriteAggregator.cs" />
   </ItemGroup>

src/contrib/cluster/Akka.DistributedData/Flag.cs

@@ -46,6 +46,8 @@ public bool Equals(Flag other)
         public IReplicatedData Merge(IReplicatedData other) => Merge((Flag) other);
         public Flag Merge(Flag other) => other.Enabled ? other : this;
         public Flag SwitchOn() => Enabled ? this : new Flag(true);
+
+        public static implicit operator bool(Flag flag) => flag.Enabled;
     }
 
     [Serializable]

src/contrib/cluster/Akka.DistributedData/GCounter.cs

@@ -10,6 +10,8 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Numerics;
+using Akka.Actor;
+using Akka.Util;
 
 namespace Akka.DistributedData
 {
@@ -45,13 +47,14 @@ public sealed class GCounter : FastMerge<GCounter>, IRemovedNodePruning<GCounter
         /// <summary>
         /// Current total value of the counter.
         /// </summary>
-        public BigInteger Value => State.Aggregate(Zero, (v, acc) => v + acc.Value);
+        public BigInteger Value { get; }
 
         public GCounter() : this(ImmutableDictionary<UniqueAddress, BigInteger>.Empty) { }
 
         public GCounter(IImmutableDictionary<UniqueAddress, BigInteger> state)
         {
             State = state;
+            Value = State.Aggregate(Zero, (v, acc) => v + acc.Value);
         }
 
         /// <summary>
@@ -146,5 +149,7 @@ public int CompareTo(GCounter other)
         }
 
         public override string ToString() => $"GCounter({Value})";
+
+        public static implicit operator BigInteger(GCounter counter) => counter.Value;
     }
 }

src/contrib/cluster/Akka.DistributedData/GSet.cs

@@ -6,8 +6,12 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
+using Akka.Cluster;
 
 namespace Akka.DistributedData
 {
@@ -35,7 +39,7 @@ public static class GSet
     /// This class is immutable, i.e. "modifying" methods return a new instance.
     /// </summary>
     [Serializable]
-    public sealed class GSet<T> : FastMerge<GSet<T>>, IReplicatedDataSerialization, IGSet, IEquatable<GSet<T>>
+    public sealed class GSet<T> : FastMerge<GSet<T>>, IReplicatedDataSerialization, IGSet, IEquatable<GSet<T>>, IEnumerable<T>
     {
         public static readonly GSet<T> Empty = new GSet<T>();
 
@@ -77,9 +81,24 @@ public bool Equals(GSet<T> other)
             return Elements.SetEquals(other.Elements);
         }
 
+        public IEnumerator<T> GetEnumerator() => Elements.GetEnumerator();
+
         public override bool Equals(object obj) => obj is GSet<T> && Equals((GSet<T>) obj);
 
         public override int GetHashCode() => Elements.GetHashCode();
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public override string ToString()
+        {
+            var sb = new StringBuilder("GSet(");
+            foreach (var element in Elements)
+            {
+                sb.Append(element).Append(',');
+            }
+            sb.Append(")");
+
+            return sb.ToString();
+        }
     }
 
     internal interface IGSetKey