fix problems after rebase

rescala-lang · Dec 9, 2024 · c649185 · c649185
1 parent dc56261
commit c649185
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Modules/RDTs/.jvm/src/test/scala/MembershipSuite.scala b/Modules/RDTs/.jvm/src/test/scala/MembershipSuite.scala
@@ -1,9 +1,9 @@
 import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Prop.propBoolean
 import org.scalacheck.{Arbitrary, Gen, Prop}
-import rdts.base.{Bottom, Lattice, LocalUid, Uid}
+import rdts.base.{Lattice, LocalUid}
 import rdts.datatypes.experiments.protocols.simplified.GeneralizedPaxos
-import rdts.datatypes.experiments.protocols.{Consensus, Membership, simplified}
+import rdts.datatypes.experiments.protocols.{Consensus, Membership, paper, simplified}
 
 import scala.util.Try
 class MembershipSuite extends munit.ScalaCheckSuite {

diff --git a/Modules/RDTs/src/main/scala/rdts/datatypes/experiments/protocols/Membership.scala b/Modules/RDTs/src/main/scala/rdts/datatypes/experiments/protocols/Membership.scala
@@ -58,7 +58,7 @@ case class Membership[A, C[_], D[_]](
     if isMember then
       bottomRound.copy(
         membershipChanging = true,
-        membersConsensus = rounds.value.membersConsensus.write(currentMembers + id)
+        membersConsensus = rounds.value.membersConsensus.propose(currentMembers + id)
       )
     else bottomRound
   }
@@ -67,7 +67,7 @@ case class Membership[A, C[_], D[_]](
     if currentMembers.size > 1 && isMember then // cannot remove last member
       bottomRound.copy(
         membershipChanging = true,
-        membersConsensus = rounds.value.membersConsensus.write(currentMembers - id)
+        membersConsensus = rounds.value.membersConsensus.propose(currentMembers - id)
       )
     else bottomRound
   }
@@ -80,7 +80,7 @@ case class Membership[A, C[_], D[_]](
   def write(value: A)(using LocalUid, Consensus[C], Consensus[D]): Membership[A, C, D] = writeRound {
     if !rounds.value.membershipChanging && isMember then
       bottomRound.copy(
-        innerConsensus = rounds.value.innerConsensus.write(value)
+        innerConsensus = rounds.value.innerConsensus.propose(value)
       )
     else bottomRound
   }
@@ -93,7 +93,7 @@ case class Membership[A, C[_], D[_]](
     val newMembers   = rounds.value.membersConsensus.merge(deltaMembers)
     val deltaInner   = rounds.value.innerConsensus.upkeep()
     val newInner     = rounds.value.innerConsensus.merge(deltaInner)
-    (newMembers.read, newInner.read) match
+    (newMembers.decision, newInner.decision) match
       // member consensus reached -> members have changed
       case (Some(members), _) =>
         assert(!members.isEmpty, "members consensus reached but no members found")