From 1347963ff6240b92716df8e2269e4712fef64bd8 Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Sat, 23 Feb 2019 03:48:27 -0500
Subject: [PATCH] make 1:1 syntax OK

---
 data_sync/README.md | 8 ++++++++
 data_sync/app.py    | 6 ++++--
 data_sync/sync.py   | 8 +++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/data_sync/README.md b/data_sync/README.md
index 68969a8..86e436e 100644
--- a/data_sync/README.md
+++ b/data_sync/README.md
@@ -124,3 +124,11 @@ enode://421a707a09d9ff08028fd9e47df876bd4cfbd873ce12cfe00702b068acf077518c5c065f
 
 geth      7053 user   68u  IPv6 141618      0t0  TCP localhost:30000->localhost:44984 (ESTABLISHED)
 geth      7415 user   63u  IPv4 141044      0t0  TCP localhost:44984->localhost:30000 (ESTABLISHED)
+
+## Next steps
+
+- End to end add several notes
+
+- Sanity check wrt adding peers manually etc
+
+- Figure out latency smaller
diff --git a/data_sync/app.py b/data_sync/app.py
index 56acbd4..bf5cee6 100644
--- a/data_sync/app.py
+++ b/data_sync/app.py
@@ -3,6 +3,8 @@ import networkwhisper, sync, sys, threading, time
 # TODO: Consider moving sync state outside of log
 # XXX: Assume {a,b}sync.log exists
 
+# TODO: UX feedback, when recv it should show
+
 # XXX: Ugly constants, should be elsewhere
 SETTINGS = {
     'a': {
@@ -80,8 +82,8 @@ def main():
     thread.start()
 
     while True:
-        text = input("> ")
-        print("You wrote", text)
+        text = input("")
+        #print("You: " + text)
         rec = sync.new_message_record(text)
         node.append_message(rec)
 
diff --git a/data_sync/sync.py b/data_sync/sync.py
index 00898a4..21eae96 100644
--- a/data_sync/sync.py
+++ b/data_sync/sync.py
@@ -297,7 +297,6 @@ class Node():
             self.sync_state[message_id][sender_pubkey]['hold_flag'] == 1
             self.sync_state[message_id][sender_pubkey]['ack_flag'] == 1
             # XXX: ACK again here?
-        # XXX: This is bad, sender here with Whisper is only pbukey
         self.sync_state[message_id][sender_pubkey] = {
             "hold_flag": 1,
             "ack_flag": 1,
@@ -317,8 +316,15 @@ class Node():
                     "send_time": 0
                 }
 
+        # XXX: Huh, This is MESSAGE, shouldn't it be PAYLOAD inside it?
+        assert message.header.type == 1, "Type should be MESSAGE, possible faulty logic"
         self.messages[message_id] = message
 
+        # XXX: Shortcuts, lets take 'em
+        text = message.payload.message.body.decode('utf-8')
+        short_sender = sender_pubkey[-4:]
+        print(short_sender + ": " + text)
+
     def on_receive_ack(self, sender_pubkey, message):
         for ack in message.payload.ack.id:
             self.logger('    ACK ({} -> {}): {} received'.format(sender_pubkey[-4:], self.name[-4:], ack[-4:]))