diff --git a/goodchain/src/helpers/SocketHelper.py b/goodchain/src/helpers/SocketHelper.py index 37955ad..aea14f2 100644 --- a/goodchain/src/helpers/SocketHelper.py +++ b/goodchain/src/helpers/SocketHelper.py @@ -4,6 +4,7 @@ from classes.TxBlock import TxBlock from helpers import DatabaseHelper as databaseHelper from helpers import UtilityHelper as utilityHelper +from helpers import BlockHelper as blockHelper import socket import pickle @@ -59,7 +60,16 @@ def connection(ip, port, db): if type(item) == TxBlock: print(f"{utilityHelper.blinkMessage('Received block from peer')}") - utilityHelper.addFile("../data/ledger.dat", item) + valid, exit = blockHelper.socketBlock(item) + + if not valid: + print(f"{utilityHelper.errorMessage('Received block is not valid')}") + continue + + if exit: + print(f"{utilityHelper.errorMessage('Closing connection and application')}") + exit() + continue continue # DATABASE STUFF @@ -67,10 +77,12 @@ def connection(ip, port, db): match item[0]: case "USER CREATE": + print(f"{utilityHelper.blinkMessage('Received user from peer')}") db.createUser(item[1], item[2], item[3], item[4]) continue case "USER DELETE": + print(f"{utilityHelper.blinkMessage('Peer deleted user')}") db.deleteUser(item[1]) continue @@ -88,4 +100,10 @@ def connection(ip, port, db): case "UPDATE LOG STATUS": db.updateLogStatus(item[1]) + continue + + if type(item) == str: + match item: + case "EXIT": + exit() continue \ No newline at end of file