From 7bfdf166dc7fef09d5d8a9ba29c7121e55c6b557 Mon Sep 17 00:00:00 2001 From: Benjamin Loison Date: Thu, 1 Jun 2023 23:51:51 +0200 Subject: [PATCH] Make `meta.py` work --- meta.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/meta.py b/meta.py index 4fce35d..466b314 100755 --- a/meta.py +++ b/meta.py @@ -2,10 +2,10 @@ import subprocess, ast -verifier, prover = [subprocess.Popen(f'./{program}.py', stdout = subprocess.PIPE, stdin = subprocess.PIPE, stderr = subprocess.DEVNULL) for program in ('verifier', 'prover')] +verifier, prover = [subprocess.Popen(f'./{program}.py', stdout = subprocess.PIPE, stdin = subprocess.PIPE, stderr = subprocess.DEVNULL, universal_newlines=True, bufsize=1) for program in ('verifier', 'prover')] def getProgramLine(program): - return program.stdout.readline().decode('ascii') + return program.stdout.readline() def getOutput(line): return ast.literal_eval(line.split('=')[1]) @@ -18,15 +18,22 @@ print(f'{protocolInitializationPhaseId=}') protocolExecutionPhaseId = getProgramOutput(verifier) print(f'{protocolExecutionPhaseId=}') -prover.stdin.write(protocolInitializationPhaseId.encode('ascii') + b'\n') +prover.stdin.write(protocolInitializationPhaseId + '\n') #getProgramLine(prover) #getProgramLine(prover) -prover.stdin.write(protocolExecutionPhaseId.encode('ascii') + b'\n') +prover.stdin.write(protocolExecutionPhaseId + '\n') #prover.stdin.close() -#verifier.stdin.write(b"test\n") +merkleTreeRoot = getOutput(getProgramLine(prover).split()[-1]) +print(f'{merkleTreeRoot=}') -#lines = prover.communicate()[0].decode('ascii').splitlines() -#print(lines) +verifier.stdin.write(merkleTreeRoot + '\n') +getProgramLine(verifier) -print(getProgramLine(prover)) +prover.stdin.write('indexesRequest.txt\n') +getProgramLine(prover) + +verifier.stdin.write('entries.txt\n') + +lines = verifier.communicate()[0].splitlines() +print(lines)