From c577b64ba33fca4fb5d879dc94a491b5003b0ae9 Mon Sep 17 00:00:00 2001
From: BMatajsz <90217645+BMatajsz@users.noreply.github.com>
Date: Mon, 2 Dec 2024 23:50:26 -0500
Subject: Progress

---
 src/main/java/derms/replica3/Replica3.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/derms/replica3')

diff --git a/src/main/java/derms/replica3/Replica3.java b/src/main/java/derms/replica3/Replica3.java
index 8863c9e..ca01fdf 100644
--- a/src/main/java/derms/replica3/Replica3.java
+++ b/src/main/java/derms/replica3/Replica3.java
@@ -52,7 +52,7 @@ public class Replica3 implements Replica{
     public boolean isAlive() { return alive; }
 
     @Override
-    public void startProcess() {
+    public void startProcess(int byzantine, int crash) {
         // TODO
 //        log.info(getClass().getSimpleName() + " started.");
         System.out.println("process started");
@@ -104,7 +104,7 @@ public class Replica3 implements Replica{
     public void restart() {
         // TODO
         shutdown();
-        startProcess();
+        startProcess(0, 0);
     }
 
     @Override
-- 
cgit v1.2.3


From 69a4c73336cfe88852251b131c14034208bb4658 Mon Sep 17 00:00:00 2001
From: BMatajsz <90217645+BMatajsz@users.noreply.github.com>
Date: Tue, 3 Dec 2024 00:15:41 -0500
Subject: Modified replicas

---
 src/main/java/derms/replica3/Replica3.java | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src/main/java/derms/replica3')

diff --git a/src/main/java/derms/replica3/Replica3.java b/src/main/java/derms/replica3/Replica3.java
index ca01fdf..b7cf8ef 100644
--- a/src/main/java/derms/replica3/Replica3.java
+++ b/src/main/java/derms/replica3/Replica3.java
@@ -27,6 +27,7 @@ public class Replica3 implements Replica{
 //    private final Logger log;
 
     private boolean alive;
+    private boolean byzFailure;
     private final ReplicaManager replicaManager;
 
     public Replica3(City city, ReplicaManager replicaManager) throws IOException {
@@ -42,6 +43,7 @@ public class Replica3 implements Replica{
 //        log.config("Local address is "+localAddr.toString());
 
         this.alive = true;
+        this.byzFailure = false;
     }
 
     public Replica3(String city, ReplicaManager replicaManager) throws IOException {
@@ -53,6 +55,20 @@ public class Replica3 implements Replica{
 
     @Override
     public void startProcess(int byzantine, int crash) {
+        // [TEST] Detect crash
+        if (crash == 1) {
+            alive = false;
+        } else {
+            alive = true;
+        }
+
+        // [TEST] Detect byzantine failure
+        if (byzantine == 1) {
+            byzFailure = true;
+        } else {
+            byzFailure = false;
+        }
+
         // TODO
 //        log.info(getClass().getSimpleName() + " started.");
         System.out.println("process started");
@@ -61,6 +77,14 @@ public class Replica3 implements Replica{
     @Override
     public void processRequest(Request request) {
 //        log.info(request.toString());
+
+        // [TEST] Simulate byzantine failure (return incorrect value)
+        if (byzFailure == true) {
+            Response response = new Response(request, replicaManager.getReplicaId(), "BYZANTINE FAILURE", false);
+            replicaManager.sendResponseToFE(response);
+            return;
+        }
+
         System.out.println("process request and good");
         String status = "";
         try {
@@ -104,6 +128,8 @@ public class Replica3 implements Replica{
     public void restart() {
         // TODO
         shutdown();
+
+        // [TEST] Restart process without byzantine failure or crash
         startProcess(0, 0);
     }
 
@@ -112,6 +138,7 @@ public class Replica3 implements Replica{
 
     private void shutdown() {
         // TODO
+        alive = false;
     }
 
     public synchronized String addResource(String resourceID, String resourceName, int duration) {
-- 
cgit v1.2.3


From 44df5df0b65df279aaf471fa8258da218ed7c522 Mon Sep 17 00:00:00 2001
From: BMatajsz <90217645+BMatajsz@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:34:00 -0500
Subject: Added expected test results

---
 src/main/java/derms/replica3/Replica3.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/derms/replica3')

diff --git a/src/main/java/derms/replica3/Replica3.java b/src/main/java/derms/replica3/Replica3.java
index b7cf8ef..9e262e3 100644
--- a/src/main/java/derms/replica3/Replica3.java
+++ b/src/main/java/derms/replica3/Replica3.java
@@ -13,6 +13,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import derms.replica3.Logger;
+import derms.util.TestLogger;
 
 public class Replica3 implements Replica{
     static final InetSocketAddress announceGroup = new InetSocketAddress("225.5.5.5", 5555);
@@ -130,6 +131,7 @@ public class Replica3 implements Replica{
         shutdown();
 
         // [TEST] Restart process without byzantine failure or crash
+        TestLogger.log("REPLICA 3: {RESTARTED}");
         startProcess(0, 0);
     }
 
-- 
cgit v1.2.3