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/replica2/Replica2.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/derms/replica2/Replica2.java')

diff --git a/src/main/java/derms/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java
index 3c9f764..9383cf5 100644
--- a/src/main/java/derms/replica2/Replica2.java
+++ b/src/main/java/derms/replica2/Replica2.java
@@ -57,7 +57,7 @@ public class Replica2 implements Replica {
 	public boolean isAlive() { return alive; }
 
 	@Override
-	public void startProcess() {
+	public void startProcess(int byzantine, int crash) {
 		try {
 			pool.execute(new ResourceAvailability.Server(localAddr, resources));
 		} catch (IOException e) {
@@ -153,7 +153,7 @@ public class Replica2 implements Replica {
 	@Override
 	public void restart() {
 		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/replica2/Replica2.java | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src/main/java/derms/replica2/Replica2.java')

diff --git a/src/main/java/derms/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java
index 9383cf5..5f24e24 100644
--- a/src/main/java/derms/replica2/Replica2.java
+++ b/src/main/java/derms/replica2/Replica2.java
@@ -24,6 +24,7 @@ public class Replica2 implements Replica {
 	private final ReplicaManager replicaManager;
 	private final ExecutorService pool;
 	private boolean alive = false;
+	private boolean byzFailure;
 
 	public Replica2(City city, ReplicaManager replicaManager) throws IOException {
 		this.city = city;
@@ -58,6 +59,20 @@ public class Replica2 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;
+        }
+
 		try {
 			pool.execute(new ResourceAvailability.Server(localAddr, resources));
 		} catch (IOException e) {
@@ -113,6 +128,13 @@ public class Replica2 implements Replica {
 	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;
+        }
+
 		String status = "";
 		try {
 			switch (request.getFunction()) {
@@ -153,6 +175,8 @@ public class Replica2 implements Replica {
 	@Override
 	public void restart() {
 		shutdown();
+
+		// [TEST] Restart process without byzantine failure or crash
 		startProcess(0, 0);
 	}
 
-- 
cgit v1.2.3


From d6067d28ce2a22c64cb595af6bca48c81b1664da Mon Sep 17 00:00:00 2001
From: BMatajsz <90217645+BMatajsz@users.noreply.github.com>
Date: Tue, 3 Dec 2024 03:30:34 -0500
Subject: Test progress

---
 src/main/java/derms/replica2/Replica2.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/derms/replica2/Replica2.java')

diff --git a/src/main/java/derms/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java
index 5f24e24..73a66b2 100644
--- a/src/main/java/derms/replica2/Replica2.java
+++ b/src/main/java/derms/replica2/Replica2.java
@@ -120,7 +120,7 @@ public class Replica2 implements Replica {
 
 		log.info("Running");
 		log.config("Local address is "+localAddr.toString());
-		alive = true;
+		//alive = true;
 		log.info(getClass().getSimpleName() + " started.");
 	}
 
-- 
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/replica2/Replica2.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/derms/replica2/Replica2.java')

diff --git a/src/main/java/derms/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java
index 73a66b2..cf21d74 100644
--- a/src/main/java/derms/replica2/Replica2.java
+++ b/src/main/java/derms/replica2/Replica2.java
@@ -1,6 +1,7 @@
 package derms.replica2;
 
 import derms.*;
+import derms.util.TestLogger;
 import derms.util.ThreadPool;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
@@ -177,6 +178,7 @@ public class Replica2 implements Replica {
 		shutdown();
 
 		// [TEST] Restart process without byzantine failure or crash
+		TestLogger.log("REPLICA 2: {RESTARTED}");
 		startProcess(0, 0);
 	}
 
-- 
cgit v1.2.3