Change algorithm for merge backup and merge dist

1 files changed, 22 insertions, 3 deletions

diff --git a/tools/mergetools.py b/tools/mergetools.py
index bea09e9..ff3d08c 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -214,6 +214,25 @@ def get_curpos(node, baseurl, own_key, paths):
         print >>sys.stderr, "ERROR: currentposition", e.response
         sys.exit(1)
 
+def get_frontend_verifiedsize(node, baseurl, own_key, paths):
+    return frontend_verify_entries(node, baseurl, own_key, paths, 0)
+
+def frontend_verify_entries(node, baseurl, own_key, paths, size):
+    try:
+        arguments = {"verify_to": size}
+        result = http_request(baseurl + "plop/v1/frontend/verify-entries",
+                              json.dumps(arguments),
+                              key=own_key, verifynode=node,
+                              publickeydir=paths["publickeys"])
+        parsed_result = json.loads(result)
+        if parsed_result.get(u"result") == u"ok":
+            return parsed_result[u"verified"]
+        print >>sys.stderr, "ERROR: verify-entries", parsed_result
+        sys.exit(1)
+    except requests.exceptions.HTTPError, e:
+        print >>sys.stderr, "ERROR: verify-entries", e.response
+        sys.exit(1)
+
 def get_verifiedsize(node, baseurl, own_key, paths):
     try:
         result = http_request(baseurl + "plop/v1/merge/verifiedsize",
@@ -319,14 +338,14 @@ def sendentries_merge(node, baseurl, own_key, paths, entries, session=None):
         print >>sys.stderr, "ERROR: sendentries_merge", baseurl, e.request, e.response
         sys.exit(1)
 
-def sendsth(node, baseurl, own_key, paths, submission):
+def publish_sth(node, baseurl, own_key, paths, submission):
     try:
-        result = http_request(baseurl + "plop/v1/frontend/sendsth",
+        result = http_request(baseurl + "plop/v1/frontend/publish-sth",
                               json.dumps(submission), key=own_key,
                               verifynode=node, publickeydir=paths["publickeys"])
         return json.loads(result)
     except requests.exceptions.HTTPError, e:
-        print >>sys.stderr, "ERROR: sendsth", e.response
+        print >>sys.stderr, "ERROR: publish-sth", e.response
         sys.exit(1)
     except ValueError, e:
         print >>sys.stderr, "==== FAILED REQUEST ===="