move old protocols

rescala-lang · Dec 17, 2024 · 03bc261 · 03bc261
1 parent c14cc95
commit 03bc261
Show file tree

Hide file tree

Showing 25 changed files with 481 additions and 484 deletions.
diff --git a/Modules/Examples/Misc JVM/src/test/scala/ex2024bft/MembershipSuite.scala b/Modules/Examples/Misc JVM/src/test/scala/ex2024bft/MembershipSuite.scala
@@ -5,7 +5,8 @@ import org.scalacheck.Prop.propBoolean
 import org.scalacheck.commands.Commands
 import org.scalacheck.{Gen, Prop}
 import rdts.base.{LocalUid, Uid}
-import rdts.datatypes.experiments.protocols.{Membership, Paxos}
+import rdts.datatypes.experiments.protocols.Membership
+import rdts.datatypes.experiments.protocols.old.Paxos
 
 import scala.collection.mutable.ArrayBuffer
 

diff --git a/Modules/Examples/Protocol Benchmarks/src/main/scala/probench/KeyValueReplica.scala b/Modules/Examples/Protocol Benchmarks/src/main/scala/probench/KeyValueReplica.scala
@@ -6,7 +6,7 @@ import probench.data.RequestResponseQueue.Req
 import rdts.base.Lattice.syntax
 import rdts.base.{Bottom, LocalUid, Uid}
 import rdts.datatypes.experiments.protocols.Membership
-import rdts.datatypes.experiments.protocols.simplified.Paxos
+import rdts.datatypes.experiments.protocols.old.simplified.Paxos
 import rdts.syntax.DeltaBuffer
 import replication.DeltaDissemination
 

diff --git a/Modules/Examples/Protocol Benchmarks/src/main/scala/probench/cli.scala b/Modules/Examples/Protocol Benchmarks/src/main/scala/probench/cli.scala
@@ -9,7 +9,7 @@ import probench.clients.{ClientCLI, EtcdClient, ProBenchClient}
 import probench.data.{ClientNodeState, ClusterData, KVOperation}
 import rdts.base.Uid
 import rdts.datatypes.experiments.protocols.Membership
-import rdts.datatypes.experiments.protocols.simplified.Paxos
+import rdts.datatypes.experiments.protocols.old.simplified.Paxos
 import replication.{FileConnection, ProtocolMessage}
 
 import java.net.{DatagramSocket, InetSocketAddress}

diff --git a/Modules/Examples/Protocol Benchmarks/src/test/scala/probench/ClusterConsensus.scala b/Modules/Examples/Protocol Benchmarks/src/test/scala/probench/ClusterConsensus.scala
@@ -7,7 +7,7 @@ import probench.clients.ProBenchClient
 import probench.data.{ClientNodeState, ClusterData, KVOperation}
 import rdts.base.{LocalUid, Uid}
 import rdts.datatypes.experiments.protocols.Membership
-import rdts.datatypes.experiments.protocols.simplified.Paxos
+import rdts.datatypes.experiments.protocols.old.simplified.Paxos
 import replication.ProtocolMessage
 
 class ClusterConsensus extends munit.FunSuite {

diff --git a/Modules/RDTs/.jvm/src/test/scala/GeneralizedPaxosSuite.scala b/Modules/RDTs/.jvm/src/test/scala/GeneralizedPaxosSuite.scala
@@ -1,4 +1,4 @@
-import rdts.datatypes.experiments.protocols.simplified.GeneralizedPaxos
+import rdts.datatypes.experiments.protocols.old.simplified.GeneralizedPaxos
 
 class GeneralizedPaxosSuite extends munit.ScalaCheckSuite {
 

diff --git a/Modules/RDTs/.jvm/src/test/scala/MembershipSuite.scala b/Modules/RDTs/.jvm/src/test/scala/MembershipSuite.scala
@@ -2,8 +2,9 @@ import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Prop.propBoolean
 import org.scalacheck.{Arbitrary, Gen, Prop}
 import rdts.base.{Lattice, LocalUid}
-import rdts.datatypes.experiments.protocols.simplified.GeneralizedPaxos
-import rdts.datatypes.experiments.protocols.{Consensus, Membership, paper, simplified}
+import rdts.datatypes.experiments.protocols.old.simplified
+import rdts.datatypes.experiments.protocols.old.simplified.GeneralizedPaxos
+import rdts.datatypes.experiments.protocols.{Consensus, Membership, Paxos}
 
 import scala.util.Try
 class MembershipSuite extends munit.ScalaCheckSuite {
@@ -37,7 +38,7 @@ class MembershipSuite extends munit.ScalaCheckSuite {
     removeMemberFreq = 1
   ).property())
 
-  property("Membership with paper paxos")(MembershipSpec[Int, paper.Paxos, paper.Paxos](
+  property("Membership with paper paxos")(MembershipSpec[Int, Paxos, Paxos](
     logging = false,
     minDevices = 3,
     maxDevices = 6,

diff --git a/Modules/RDTs/.jvm/src/test/scala/PaperPaxosSuite.scala b/Modules/RDTs/.jvm/src/test/scala/PaperPaxosSuite.scala
@@ -1,4 +1,4 @@
-import rdts.datatypes.experiments.protocols.paper.Paxos
+import rdts.datatypes.experiments.protocols.Paxos
 class PaperPaxosSuite extends munit.ScalaCheckSuite:
 
   //  override def scalaCheckInitialSeed = "ZcBq5Oa3t8-hWG0Snkx22h6nivxFRCvp27NO4tFKzbN="

diff --git a/Modules/RDTs/.jvm/src/test/scala/SimplePaxosSuite.scala b/Modules/RDTs/.jvm/src/test/scala/SimplePaxosSuite.scala
@@ -2,7 +2,7 @@ import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.Prop.propBoolean
 import org.scalacheck.{Arbitrary, Gen, Prop}
 import rdts.base.LocalUid
-import rdts.datatypes.experiments.protocols.simplified
+import rdts.datatypes.experiments.protocols.old.simplified.Paxos
 
 import scala.util.Try
 
@@ -31,7 +31,7 @@ class SimplePaxosSpec[A: Arbitrary](
     maxDevices: Int,
     writeFreq: Int,
     mergeFreq: Int
-) extends ConsensusPropertySpec[A, simplified.Paxos](
+) extends ConsensusPropertySpec[A, Paxos](
       logging,
       minDevices,
       maxDevices,
@@ -46,8 +46,8 @@ class SimplePaxosSpec[A: Arbitrary](
 
   class PWrite(id: LocalUid, value: A) extends Write(id, value) {
     override def postCondition(
-        state: Map[LocalUid, simplified.Paxos[A]],
-        result: Try[Map[LocalUid, simplified.Paxos[A]]]
+                                state: Map[LocalUid, Paxos[A]],
+                                result: Try[Map[LocalUid, Paxos[A]]]
     ): Prop =
       val res            = result.get
       val doubleProposal = res(id).accepts.groupBy(_.proposal).find(_._2.size > 1)