Remove merged method requirement on CvRDT

Sources/CRDT/CvRDT.swift

@@ -22,13 +22,4 @@ public protocol CvRDT: PartialOrderable {
     /// - Parameter other: The other instance
     /// - Throws: Throws an error if the states could not be merged.
     mutating func merge(_ other: Self) throws
-
-    /// An idempotent and commutative function which attempts to produce a new instance with the
-    /// other instance's state merged with this instance's state.
-    ///
-    /// - Parameter other: The other instance
-    /// - Throws: Throws an error if the states could not be merged.
-    /// - Returns: A new instance which is the result of merging this instance's state with the
-    ///            other instance's state.
-    func merged(_ other: Self) throws -> Self
 }

Sources/CRDT/VClock.swift

@@ -271,6 +271,13 @@ extension VClock: CvRDT {
         }
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: VClock<Actor, Clock>) throws -> VClock<Actor, Clock> {
         var copy = self
         try copy.merge(other)

Sources/CRDTCounters/GCounter.swift

@@ -77,6 +77,13 @@ extension GCounter: CvRDT {
         try self.actorCounters.merge(other.actorCounters)
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: GCounter<Actor>) throws -> GCounter<Actor> {
         var copy = self
         try copy.merge(other)

Sources/CRDTRegisters/LWWRegister.swift

@@ -77,6 +77,13 @@ extension LWWRegister: CvRDT {
         try self.assign(value: other.value, timestamp: other.timestamp)
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: LWWRegister<Value, Timestamp>) throws -> LWWRegister<Value, Timestamp> {
         var copy = self
         try copy.merge(other)

Sources/CRDTRegisters/MVRegister.swift

@@ -195,6 +195,13 @@ extension MVRegister: CvRDT {
         self.values = keptSelfValues
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: MVRegister<Value, Actor, Clock>) throws -> MVRegister<Value, Actor, Clock> {
         var copy = self
         try copy.merge(other)

Sources/CRDTSets/GSet.swift

@@ -66,6 +66,13 @@ extension GSet: CvRDT {
         self.formUnion(other)
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: GSet<Element>) throws -> GSet<Element> {
         var copy = self
         try copy.merge(other)

Sources/CRDTSets/TwoPhaseSet.swift

@@ -85,6 +85,13 @@ extension TwoPhaseSet: CvRDT {
         self.removedElements.formUnion(other.removedElements)
     }
 
+    /// An idempotent and commutative function which attempts to produce a new instance with the
+    /// other instance's state merged with this instance's state.
+    ///
+    /// - Parameter other: The other instance
+    /// - Throws: Throws an error if the states could not be merged.
+    /// - Returns: A new instance which is the result of merging this instance's state with the
+    ///            other instance's state.
     public func merged(_ other: TwoPhaseSet<Element>) throws -> TwoPhaseSet<Element> {
         var copy = self
         try copy.merge(other)