From 949ea52a15d935c0bb1ff44de89f3ffa03eb3456 Mon Sep 17 00:00:00 2001
From: Xavier Perret <xa.perret@outlook.com>
Date: Sun, 30 Oct 2022 11:44:33 +0100
Subject: [PATCH] removed duplicate code
---
app/process-connection/process-connection.go | 40 ++++++++++++--------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/app/process-connection/process-connection.go b/app/process-connection/process-connection.go
index 4c8b5f1..bad88b6 100644
--- a/app/process-connection/process-connection.go
+++ b/app/process-connection/process-connection.go
@@ -73,12 +73,7 @@ func processTransaction(serverListener net.Listener, serverConfig Config, object
err = nil
continue
}
- fmt.Println("*****************************************")
- fmt.Println("Processing client request number ", count)
- fmt.Println("The process-manage-connection is ", connection)
- fmt.Println("The remote address is ", connection.RemoteAddr())
- fmt.Println("The local address is ", connection.LocalAddr())
- fmt.Println("*****************************************")
+ utilities.PrintConnection(connection, count)
err = json.NewDecoder(connection).Decode(&trans)
if err != nil {
@@ -165,12 +160,8 @@ func vote(server net.Listener, serverConfig Config, trans Transaction, parentAdd
err = nil
continue
}
- fmt.Println("*****************************************")
- fmt.Println("Processing client request number ", count)
- fmt.Println("The process-manage-connection is ", connection)
- fmt.Println("The remote address is ", connection.RemoteAddr())
- fmt.Println("The local address is ", connection.LocalAddr())
- fmt.Println("*****************************************")
+
+ utilities.PrintConnection(connection, count)
err = json.NewDecoder(connection).Decode(&mess)
if err != nil {
@@ -219,13 +210,24 @@ func vote(server net.Listener, serverConfig Config, trans Transaction, parentAdd
return ack
}
+func processFakeRequest(conn net.Conn, serverListener net.Listener, serverConfig Config, objectStorage Blob, mess Message, amIRoot bool) {
+ var trans Transaction
+ var body map[string]interface{} = mess.MessageBody.(map[string]interface{})
+
+}
+
+func processVoteRequest(conn net.Conn, serverListener net.Listener, serverConfig Config, objectStorage Blob, mess Message, amIRoot bool) {
+ var trans Transaction
+ var body map[string]interface{} = mess.MessageBody.(map[string]interface{})
+
+ fmt.Println("Received back a transaction")
+ utilities.PrintTransaction(trans)
+}
+
func ProcessClient(conn net.Conn, server net.Listener, objectStorage Blob, serverConfig Config, amIRoot bool, mutex *sync.Mutex) {
mutex.Lock()
defer mutex.Unlock()
- fmt.Println("Processing client")
- fmt.Println("The conn is ", conn)
- fmt.Println("The remote address is ", conn.RemoteAddr())
- fmt.Println("The local address is ", conn.LocalAddr())
+ utilities.PrintConnection(conn, 0)
var mess Message
jsonDecoder := json.NewDecoder(conn)
@@ -245,6 +247,12 @@ func ProcessClient(conn net.Conn, server net.Listener, objectStorage Blob, serve
} else if mess.MessageType == "list" {
fmt.Println("Received an order to list all transactions")
listAllTransactionsToClient(conn, objectStorage)
+ } else if mess.MessageType == "fakeRequest" {
+ fmt.Println("Received a request to fake transaction")
+ processFakeRequest(conn, server, serverConfig, objectStorage, mess, amIRoot)
+ } else if mess.MessageType == "voteRequest" {
+ fmt.Println("Received a request to vote on a given transaction")
+ processVoteRequest(conn, server, serverConfig, objectStorage, mess, amIRoot)
} else {
fmt.Println("Unknown message type")
}
--
GitLab