Merge branch 'main' of https://git.mamahaha.work/dqy/mimajingsai

src/client.py

@@ -209,7 +209,8 @@ def check_merge(ct: int, ip: str):
         temp_cfrag_cts = []
         for i in cfrag_cts:
             capsule = pickle.loads(i[0])
-            temp_cfrag_cts.append((capsule, int(i[1]).to_bytes(32)))
+            byte_length = (ct.bit_length() + 7) // 8
+            temp_cfrag_cts.append((capsule, int(i[1]).to_bytes(byte_length)))
 
         cfrags = mergecfrag(temp_cfrag_cts)
 
@@ -367,10 +368,12 @@ async def receive_request(i_m: IP_Message):
     # message = xxxxx
 
     # 根据message name到测试文本查找对应值
-    message = test_msessgaes[i_m.message_name]
+    try:
+        message = test_msessgaes[i_m.message_name]
 
-    # message = b"hello world" + random.randbytes(8)
-    print(f"Generated message: {message}")
+    except:
+        message = b"hello world" + random.randbytes(8)
+    print(f"Message to be send: {message}")
 
     # send message to nodes
     await send_messages(tuple(node_ips), message, dest_ip, pk_B, threshold)