wip

test/xor.cpp

@@ -1,31 +1,128 @@
 #include <iostream>
+#include <sstream>
 
 #include "golpe.h"
 #include "xor.h"
 
 
-int main() {
-    XorView x1(16);
-    x1.addElem(1000, std::string(16, 'a'));
-    x1.addElem(2000, std::string(16, 'b'));
-    x1.finalise();
 
-    XorView x2(16);
-    x2.addElem(2000, std::string(16, 'b'));
-    x2.addElem(3000, std::string(16, 'c'));
+std::vector<std::string> split(const std::string &s, char delim) {
+    std::vector<std::string> result;
+    std::stringstream ss (s);
+    std::string item;
+
+    while (getline (ss, item, delim)) {
+        result.push_back (item);
+    }
+
+    return result;
+}
+
+
+
+int main() {
+    const uint64_t idSize = 16;
+
+    // x1 is client, x2 is relay
+    XorView x1(idSize);
+    XorView x2(idSize);
+
+    std::set<std::string> ids1;
+    std::set<std::string> ids2;
+
+    std::string line;
+    while (std::cin) {
+        std::getline(std::cin, line);
+        if (!line.size()) continue;
+
+        auto items = split(line, ',');
+        if (items.size() != 3) throw herr("too few items");
+
+        int mode = std::stoi(items[0]);
+        uint64_t created = std::stoull(items[1]);
+        auto id = from_hex(items[2]);
+        if (id.size() != idSize) throw herr("unexpected id size");
+
+        if (mode == 1) {
+            x1.addElem(created, id);
+            ids1.insert(id);
+        } else if (mode == 2) {
+            x2.addElem(created, id);
+            ids2.insert(id);
+        } else if (mode == 3) {
+            x1.addElem(created, id);
+            x2.addElem(created, id);
+            ids1.insert(id);
+            ids2.insert(id);
+        } else {
+            throw herr("unexpected mode");
+        }
+
+        if (mode == 1) std::cerr << "CLIENT-ONLY: " << to_hex(id) << std::endl;
+        if (mode == 2) std::cerr << "RELAY-ONLY : " << to_hex(id) << std::endl;
+        if (mode == 3) std::cerr << "BOTH       : " << to_hex(id) << std::endl;
+
+    }
+
+    std::cerr << "BEGIN RECONCILATION" << std::endl;
+
+    x1.finalise();
     x2.finalise();
 
-    {
-        auto q = x1.initialQuery();
-        std::cout << to_hex(q) << std::endl;
+    std::string q = x1.initialQuery();
 
-        std::vector<std::string> have, need;
-        auto q2 = x2.handleQuery(q, have, need);
+    uint64_t round = 0;
 
-        for (auto &s : have) std::cout << "HAVE: " << to_hex(s) << std::endl;
-        for (auto &s : need) std::cout << "NEED: " << to_hex(s) << std::endl;
-        std::cout << to_hex(q2) << std::endl;
+    while (q.size()) {
+        round++;
+        std::cerr << "ROUND A " << round << std::endl;
+        std::cerr << "CLIENT -> RELAY" << std::endl;
+        {
+            std::vector<std::string> have, need;
+            q = x2.handleQuery(q, have, need);
+
+            // q and have are returned to client
+            for (auto &id : have) {
+                ids1.insert(id);
+                std::cerr << "ADD CLIENT: " << to_hex(id) << std::endl;
+            }
+            for (auto &id : need) {
+                ids2.insert(id);
+                std::cerr << "ADD RELAY:  " << to_hex(id) << std::endl;
+            }
+        }
+
+        if (q.size()) {
+        std::cerr << "ROUND B " << round << std::endl;
+        std::cerr << "RELAY -> CLIENT" << std::endl;
+            std::vector<std::string> have, need;
+            q = x1.handleQuery(q, have, need);
+
+            for (auto &id : need) {
+                ids1.insert(id);
+                std::cerr << "ADD CLIENT: " << to_hex(id) << std::endl;
+            }
+            for (auto &id : have) {
+                ids2.insert(id);
+                std::cerr << "ADD RELAY:  " << to_hex(id) << std::endl;
+            }
+        }
     }
 
+    if (ids1 != ids2) {
+        for (const auto &id : ids1) if (!ids2.contains(id)) std::cerr << "In CLIENT not RELAY: " << to_hex(id) << std::endl;
+        for (const auto &id : ids2) if (!ids1.contains(id)) std::cerr << "In RELAY not CLIENT: " << to_hex(id) << std::endl;
+        throw herr("mismatch");
+    }
+
+/*
+    std::vector<std::string> have, need;
+    auto q2 = x2.handleQuery(q, have, need);
+
+    for (auto &s : have) std::cout << "HAVE: " << to_hex(s) << std::endl;
+    for (auto &s : need) std::cout << "NEED: " << to_hex(s) << std::endl;
+    std::cout << to_hex(q2) << std::endl;
+*/
+
     return 0;
 }

test/xorTest.pl

@@ -0,0 +1,33 @@
+#!/usr/bin/env perl
+
+use IPC::Open2;
+use Session::Token;
+
+my $idSize = 16;
+
+srand($ENV{SEED} || 0);
+my $stgen = Session::Token->new(seed => "\x00" x 1024, alphabet => '0123456789abcdef', length => $idSize * 2);
+
+my $pid = open2(my $outfile, my $infile, './test/xor');
+
+my $num = rnd(10000) + 1;
+
+for (1..$num) {
+    my $mode = rnd(3) + 1;
+    my $created = 1677970534 + rnd($num);
+    my $id = $stgen->get;
+    print $infile "$mode,$created,$id\n";
+}
+
+close($infile);
+
+while (<$outfile>) {
+    print $_;
+}
+
+
+
+sub rnd {
+    my $n = shift;
+    return int(rand() * $n);
+}