From 8eaad6659e3bca3c5d3f91297296970c4460a3ef Mon Sep 17 00:00:00 2001 From: Richie <2837357W@student.gla.ac.uk> Date: Mon, 23 Oct 2023 22:25:15 +0800 Subject: [PATCH] modify return and function names --- safeshare/safeshare_vdb/dynamo.proto | 4 ++-- safeshare/safeshare_vdb/dynamo_pb2.py | 2 +- safeshare/safeshare_vdb/dynamo_pb2_grpc.py | 28 +++++++++++----------- safeshare/safeshare_vdb/server.py | 10 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/safeshare/safeshare_vdb/dynamo.proto b/safeshare/safeshare_vdb/dynamo.proto index 6a77b21..5bcfbb4 100644 --- a/safeshare/safeshare_vdb/dynamo.proto +++ b/safeshare/safeshare_vdb/dynamo.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package dynamo_db; service Dynamo_DB { - rpc CheckFile (Request) returns (Response) {} - rpc UpdateFile (Request) returns (Response) {} + rpc CheckHash (Request) returns (Response) {} + rpc UpdateHash (Request) returns (Response) {} } message Request { diff --git a/safeshare/safeshare_vdb/dynamo_pb2.py b/safeshare/safeshare_vdb/dynamo_pb2.py index 81254d5..95b2918 100644 --- a/safeshare/safeshare_vdb/dynamo_pb2.py +++ b/safeshare/safeshare_vdb/dynamo_pb2.py @@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x64ynamo.proto\x12\tdynamo_db\"\x1c\n\x07Request\x12\x11\n\tfile_hash\x18\x02 \x01(\t\"\x1c\n\x08Response\x12\x10\n\x08is_exist\x18\x01 \x01(\x08\x32|\n\tDynamo_DB\x12\x36\n\tCheckFile\x12\x12.dynamo_db.Request\x1a\x13.dynamo_db.Response\"\x00\x12\x37\n\nUpdateFile\x12\x12.dynamo_db.Request\x1a\x13.dynamo_db.Response\"\x00\x62\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0c\x64ynamo.proto\x12\tdynamo_db\"\x1c\n\x07Request\x12\x11\n\tfile_hash\x18\x02 \x01(\t\"\x1c\n\x08Response\x12\x10\n\x08is_exist\x18\x01 \x01(\x08\x32|\n\tDynamo_DB\x12\x36\n\tCheckHash\x12\x12.dynamo_db.Request\x1a\x13.dynamo_db.Response\"\x00\x12\x37\n\nUpdateHash\x12\x12.dynamo_db.Request\x1a\x13.dynamo_db.Response\"\x00\x62\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) diff --git a/safeshare/safeshare_vdb/dynamo_pb2_grpc.py b/safeshare/safeshare_vdb/dynamo_pb2_grpc.py index 4e2bab5..f062266 100644 --- a/safeshare/safeshare_vdb/dynamo_pb2_grpc.py +++ b/safeshare/safeshare_vdb/dynamo_pb2_grpc.py @@ -14,13 +14,13 @@ class Dynamo_DBStub(object): Args: channel: A grpc.Channel. """ - self.CheckFile = channel.unary_unary( - '/dynamo_db.Dynamo_DB/CheckFile', + self.CheckHash = channel.unary_unary( + '/dynamo_db.Dynamo_DB/CheckHash', request_serializer=dynamo__pb2.Request.SerializeToString, response_deserializer=dynamo__pb2.Response.FromString, ) - self.UpdateFile = channel.unary_unary( - '/dynamo_db.Dynamo_DB/UpdateFile', + self.UpdateHash = channel.unary_unary( + '/dynamo_db.Dynamo_DB/UpdateHash', request_serializer=dynamo__pb2.Request.SerializeToString, response_deserializer=dynamo__pb2.Response.FromString, ) @@ -29,13 +29,13 @@ class Dynamo_DBStub(object): class Dynamo_DBServicer(object): """Missing associated documentation comment in .proto file.""" - def CheckFile(self, request, context): + def CheckHash(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') - def UpdateFile(self, request, context): + def UpdateHash(self, request, context): """Missing associated documentation comment in .proto file.""" context.set_code(grpc.StatusCode.UNIMPLEMENTED) context.set_details('Method not implemented!') @@ -44,13 +44,13 @@ class Dynamo_DBServicer(object): def add_Dynamo_DBServicer_to_server(servicer, server): rpc_method_handlers = { - 'CheckFile': grpc.unary_unary_rpc_method_handler( - servicer.CheckFile, + 'CheckHash': grpc.unary_unary_rpc_method_handler( + servicer.CheckHash, request_deserializer=dynamo__pb2.Request.FromString, response_serializer=dynamo__pb2.Response.SerializeToString, ), - 'UpdateFile': grpc.unary_unary_rpc_method_handler( - servicer.UpdateFile, + 'UpdateHash': grpc.unary_unary_rpc_method_handler( + servicer.UpdateHash, request_deserializer=dynamo__pb2.Request.FromString, response_serializer=dynamo__pb2.Response.SerializeToString, ), @@ -65,7 +65,7 @@ class Dynamo_DB(object): """Missing associated documentation comment in .proto file.""" @staticmethod - def CheckFile(request, + def CheckHash(request, target, options=(), channel_credentials=None, @@ -75,14 +75,14 @@ class Dynamo_DB(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dynamo_db.Dynamo_DB/CheckFile', + return grpc.experimental.unary_unary(request, target, '/dynamo_db.Dynamo_DB/CheckHash', dynamo__pb2.Request.SerializeToString, dynamo__pb2.Response.FromString, options, channel_credentials, insecure, call_credentials, compression, wait_for_ready, timeout, metadata) @staticmethod - def UpdateFile(request, + def UpdateHash(request, target, options=(), channel_credentials=None, @@ -92,7 +92,7 @@ class Dynamo_DB(object): wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dynamo_db.Dynamo_DB/UpdateFile', + return grpc.experimental.unary_unary(request, target, '/dynamo_db.Dynamo_DB/UpdateHash', dynamo__pb2.Request.SerializeToString, dynamo__pb2.Response.FromString, options, channel_credentials, diff --git a/safeshare/safeshare_vdb/server.py b/safeshare/safeshare_vdb/server.py index e16fd6d..e8a875a 100644 --- a/safeshare/safeshare_vdb/server.py +++ b/safeshare/safeshare_vdb/server.py @@ -19,21 +19,21 @@ hex_pattern = re.compile("^[a-fA-F0-9]+$") def check_sha256(sha256): response = sha256_table.get_item(Key={'sha256': sha256}) - return True if 'Item' in response else False + return 'Item' in response def check_sha1(sha1): response = sha1_table.get_item(Key={'sha1': sha1}) - return True if 'Item' in response else False + return 'Item' in response def check_md5(md5): response = md5_table.get_item(Key={'md5': md5}) - return True if 'Item' in response else False + return 'Item' in response class Dynamo(pb2_grpc.Dynamo_DBServicer): - def CheckFile(self, request, context): + def CheckHash(self, request, context): if not hex_pattern.match(request.file_hash): return pb2.Response(is_exist=False) else: @@ -47,7 +47,7 @@ class Dynamo(pb2_grpc.Dynamo_DBServicer): else: return pb2.Response(is_exist=False) - def UpdateFile(self, request, context): + def UpdateHash(self, request, context): if not hex_pattern.match(request.file_hash): return pb2.Response(is_exist=False) else: